aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2007-12-23 04:42:55 +0000
committerCharles Krinke2007-12-23 04:42:55 +0000
commitc34b5e90716a9024eb079536b747100de3637457 (patch)
tree9dbd30902cce0afacdfc09f95c0bc6d22d28bb09
parentMiscellaneous small tweaks and more logging messages to move towards resolvin... (diff)
downloadopensim-SC-c34b5e90716a9024eb079536b747100de3637457.zip
opensim-SC-c34b5e90716a9024eb079536b747100de3637457.tar.gz
opensim-SC-c34b5e90716a9024eb079536b747100de3637457.tar.bz2
opensim-SC-c34b5e90716a9024eb079536b747100de3637457.tar.xz
Clean up the region initialization GridServer messages a bit.
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs14
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index c2e8e94..cb9f979 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -421,7 +421,8 @@ namespace OpenSim.Grid.GridServer
421 } 421 }
422 else if (requestData.ContainsKey("region_handle")) 422 else if (requestData.ContainsKey("region_handle"))
423 { 423 {
424 Console.WriteLine("requesting data for region " + (string) requestData["region_handle"]); 424 //CFK: The if/else below this makes this message redundant.
425 //CFK: Console.WriteLine("requesting data for region " + (string) requestData["region_handle"]);
425 simData = getRegion(Convert.ToUInt64((string) requestData["region_handle"])); 426 simData = getRegion(Convert.ToUInt64((string) requestData["region_handle"]));
426 } 427 }
427 428
@@ -433,7 +434,8 @@ namespace OpenSim.Grid.GridServer
433 } 434 }
434 else 435 else
435 { 436 {
436 Console.WriteLine("found region"); 437 MainLog.Instance.Verbose("DATA", "found " + (string)simData.regionName + " regionHandle = " +
438 (string)requestData["region_handle"]);
437 responseData["sim_ip"] = Util.GetHostFromDNS(simData.serverIP).ToString(); 439 responseData["sim_ip"] = Util.GetHostFromDNS(simData.serverIP).ToString();
438 responseData["sim_port"] = simData.serverPort.ToString(); 440 responseData["sim_port"] = simData.serverPort.ToString();
439 responseData["http_port"] = simData.httpPort.ToString(); 441 responseData["http_port"] = simData.httpPort.ToString();
@@ -510,8 +512,8 @@ namespace OpenSim.Grid.GridServer
510 512
511 simProfileList.Add(simProfileBlock); 513 simProfileList.Add(simProfileBlock);
512 } 514 }
513 MainLog.Instance.Verbose("MAP", "Fast map" + simProfileList.Count.ToString() + 515 MainLog.Instance.Verbose("MAP", "Fast map " + simProfileList.Count.ToString() +
514 " @ (" + xmin + "," + ymin + ")..(" + xmax + "," + ymax + ")" ); 516 " regions @ (" + xmin + "," + ymin + ")..(" + xmax + "," + ymax + ")" );
515 } 517 }
516 else 518 else
517 { 519 {
@@ -545,8 +547,8 @@ namespace OpenSim.Grid.GridServer
545 } 547 }
546 } 548 }
547 } 549 }
548 MainLog.Instance.Verbose("MAP", "Std map" + simProfileList.Count.ToString() + 550 MainLog.Instance.Verbose("MAP", "Std map " + simProfileList.Count.ToString() +
549 " @ (" + xmin + "," + ymin + ")..(" + xmax + "," + ymax + ")"); 551 " regions @ (" + xmin + "," + ymin + ")..(" + xmax + "," + ymax + ")");
550 } 552 }
551 553
552 responseData["sim-profiles"] = simProfileList; 554 responseData["sim-profiles"] = simProfileList;