diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 16 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/UserManager.cs | 3 |
2 files changed, 14 insertions, 5 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 06e83f8..6ddb921 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -261,12 +261,16 @@ namespace OpenSim.Grid.GridServer | |||
261 | 261 | ||
262 | TheSim.serverIP = (string)requestData["sim_ip"]; | 262 | TheSim.serverIP = (string)requestData["sim_ip"]; |
263 | TheSim.serverPort = Convert.ToUInt32((string)requestData["sim_port"]); | 263 | TheSim.serverPort = Convert.ToUInt32((string)requestData["sim_port"]); |
264 | TheSim.httpPort = Convert.ToUInt32((string)requestData["http_port"]); | ||
265 | TheSim.remotingPort = Convert.ToUInt32((string)requestData["remoting_port"]); | ||
264 | TheSim.regionLocX = Convert.ToUInt32((string)requestData["region_locx"]); | 266 | TheSim.regionLocX = Convert.ToUInt32((string)requestData["region_locx"]); |
265 | TheSim.regionLocY = Convert.ToUInt32((string)requestData["region_locy"]); | 267 | TheSim.regionLocY = Convert.ToUInt32((string)requestData["region_locy"]); |
266 | TheSim.regionLocZ = 0; | 268 | TheSim.regionLocZ = 0; |
267 | 269 | ||
268 | TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256)); | 270 | TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256)); |
271 | System.Console.WriteLine("adding region " + TheSim.regionLocX + " , " + TheSim.regionLocY + " , " + TheSim.regionHandle); | ||
269 | TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/"; | 272 | TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/"; |
273 | TheSim.httpServerURI = "http://" + TheSim.serverIP + ":" + TheSim.httpPort + "/"; | ||
270 | 274 | ||
271 | Console.WriteLine("NEW SIM: " + TheSim.serverURI); | 275 | Console.WriteLine("NEW SIM: " + TheSim.serverURI); |
272 | TheSim.regionName = (string)requestData["sim_name"]; | 276 | TheSim.regionName = (string)requestData["sim_name"]; |
@@ -400,6 +404,8 @@ namespace OpenSim.Grid.GridServer | |||
400 | { | 404 | { |
401 | responseData["sim_ip"] = simData.serverIP; | 405 | responseData["sim_ip"] = simData.serverIP; |
402 | responseData["sim_port"] = simData.serverPort.ToString(); | 406 | responseData["sim_port"] = simData.serverPort.ToString(); |
407 | responseData["http_port"] = simData.httpPort.ToString(); | ||
408 | responseData["remoting_port"] = simData.remotingPort.ToString(); | ||
403 | responseData["region_locx"] = simData.regionLocX.ToString() ; | 409 | responseData["region_locx"] = simData.regionLocX.ToString() ; |
404 | responseData["region_locy"] = simData.regionLocY.ToString(); | 410 | responseData["region_locy"] = simData.regionLocY.ToString(); |
405 | responseData["region_UUID"] = simData.UUID.UUID.ToString(); | 411 | responseData["region_UUID"] = simData.UUID.UUID.ToString(); |
@@ -438,7 +444,7 @@ namespace OpenSim.Grid.GridServer | |||
438 | response.Value = responseData; | 444 | response.Value = responseData; |
439 | IList simProfileList = new ArrayList(); | 445 | IList simProfileList = new ArrayList(); |
440 | 446 | ||
441 | bool fastMode = true; // MySQL Only | 447 | bool fastMode = false; // MySQL Only |
442 | 448 | ||
443 | if (fastMode) | 449 | if (fastMode) |
444 | { | 450 | { |
@@ -449,6 +455,7 @@ namespace OpenSim.Grid.GridServer | |||
449 | Hashtable simProfileBlock = new Hashtable(); | 455 | Hashtable simProfileBlock = new Hashtable(); |
450 | simProfileBlock["x"] = aSim.Value.regionLocX.ToString(); | 456 | simProfileBlock["x"] = aSim.Value.regionLocX.ToString(); |
451 | simProfileBlock["y"] = aSim.Value.regionLocY.ToString(); | 457 | simProfileBlock["y"] = aSim.Value.regionLocY.ToString(); |
458 | System.Console.WriteLine("send neighbour info for " + aSim.Value.regionLocX.ToString() + " , " + aSim.Value.regionLocY.ToString()); | ||
452 | simProfileBlock["name"] = aSim.Value.regionName; | 459 | simProfileBlock["name"] = aSim.Value.regionName; |
453 | simProfileBlock["access"] = 21; | 460 | simProfileBlock["access"] = 21; |
454 | simProfileBlock["region-flags"] = 512; | 461 | simProfileBlock["region-flags"] = 512; |
@@ -470,11 +477,12 @@ namespace OpenSim.Grid.GridServer | |||
470 | else | 477 | else |
471 | { | 478 | { |
472 | SimProfileData simProfile; | 479 | SimProfileData simProfile; |
473 | for (int x = xmin; x < xmax; x++) | 480 | for (int x = xmin; x < xmax+1; x++) |
474 | { | 481 | { |
475 | for (int y = ymin; y < ymax; y++) | 482 | for (int y = ymin; y < ymax+1; y++) |
476 | { | 483 | { |
477 | simProfile = getRegion(Helpers.UIntsToLong((uint)(x * 256), (uint)(y * 256))); | 484 | ulong regHandle = Helpers.UIntsToLong((uint)(x * 256), (uint)(y * 256)); |
485 | simProfile = getRegion(regHandle); | ||
478 | if (simProfile != null) | 486 | if (simProfile != null) |
479 | { | 487 | { |
480 | Hashtable simProfileBlock = new Hashtable(); | 488 | Hashtable simProfileBlock = new Hashtable(); |
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs index 7ae7853..04bf64a 100644 --- a/OpenSim/Grid/UserServer/UserManager.cs +++ b/OpenSim/Grid/UserServer/UserManager.cs | |||
@@ -85,9 +85,10 @@ namespace OpenSim.Grid.UserServer | |||
85 | theUser.currentAgent.currentRegion = SimInfo.UUID; | 85 | theUser.currentAgent.currentRegion = SimInfo.UUID; |
86 | theUser.currentAgent.currentHandle = SimInfo.regionHandle; | 86 | theUser.currentAgent.currentHandle = SimInfo.regionHandle; |
87 | 87 | ||
88 | System.Console.WriteLine("sending reply"); | ||
88 | // Send | 89 | // Send |
89 | XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); | 90 | XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); |
90 | XmlRpcResponse GridResp = GridReq.Send(SimInfo.serverURI, 3000); | 91 | XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 3000); |
91 | } | 92 | } |
92 | } | 93 | } |
93 | } | 94 | } |