diff options
Diffstat (limited to 'OpenSim/Grid/GridServer/GridManager.cs')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 8544742..09cbe7f 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -234,7 +234,7 @@ namespace OpenSim.Grid.GridServer | |||
234 | { | 234 | { |
235 | TheSim = getRegion(new LLUUID((string) requestData["UUID"])); | 235 | TheSim = getRegion(new LLUUID((string) requestData["UUID"])); |
236 | 236 | ||
237 | // logToDB((new LLUUID((string)requestData["UUID"])).ToStringHyphenated(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID."); | 237 | // logToDB((new LLUUID((string)requestData["UUID"])).ToString(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID."); |
238 | } | 238 | } |
239 | else if (requestData.ContainsKey("region_handle")) | 239 | else if (requestData.ContainsKey("region_handle")) |
240 | { | 240 | { |
@@ -316,7 +316,7 @@ namespace OpenSim.Grid.GridServer | |||
316 | catch (Exception e) | 316 | catch (Exception e) |
317 | { | 317 | { |
318 | MainLog.Instance.Warn("storage", | 318 | MainLog.Instance.Warn("storage", |
319 | "Unable to add region " + TheSim.UUID.ToStringHyphenated() + " via " + kvp.Key); | 319 | "Unable to add region " + TheSim.UUID.ToString() + " via " + kvp.Key); |
320 | MainLog.Instance.Warn("storage", e.ToString()); | 320 | MainLog.Instance.Warn("storage", e.ToString()); |
321 | } | 321 | } |
322 | 322 | ||
@@ -502,7 +502,7 @@ namespace OpenSim.Grid.GridServer | |||
502 | simProfileBlock["sim_ip"] = aSim.Value.serverIP.ToString(); | 502 | simProfileBlock["sim_ip"] = aSim.Value.serverIP.ToString(); |
503 | simProfileBlock["sim_port"] = aSim.Value.serverPort.ToString(); | 503 | simProfileBlock["sim_port"] = aSim.Value.serverPort.ToString(); |
504 | simProfileBlock["sim_uri"] = aSim.Value.serverURI.ToString(); | 504 | simProfileBlock["sim_uri"] = aSim.Value.serverURI.ToString(); |
505 | simProfileBlock["uuid"] = aSim.Value.UUID.ToStringHyphenated(); | 505 | simProfileBlock["uuid"] = aSim.Value.UUID.ToString(); |
506 | simProfileBlock["remoting_port"] = aSim.Value.remotingPort; | 506 | simProfileBlock["remoting_port"] = aSim.Value.remotingPort; |
507 | 507 | ||
508 | simProfileList.Add(simProfileBlock); | 508 | simProfileList.Add(simProfileBlock); |
@@ -529,14 +529,14 @@ namespace OpenSim.Grid.GridServer | |||
529 | simProfileBlock["region-flags"] = 0; | 529 | simProfileBlock["region-flags"] = 0; |
530 | simProfileBlock["water-height"] = 20; | 530 | simProfileBlock["water-height"] = 20; |
531 | simProfileBlock["agents"] = 1; | 531 | simProfileBlock["agents"] = 1; |
532 | simProfileBlock["map-image-id"] = simProfile.regionMapTextureID.ToStringHyphenated(); | 532 | simProfileBlock["map-image-id"] = simProfile.regionMapTextureID.ToString(); |
533 | 533 | ||
534 | // For Sugilite compatibility | 534 | // For Sugilite compatibility |
535 | simProfileBlock["regionhandle"] = simProfile.regionHandle.ToString(); | 535 | simProfileBlock["regionhandle"] = simProfile.regionHandle.ToString(); |
536 | simProfileBlock["sim_ip"] = simProfile.serverIP.ToString(); | 536 | simProfileBlock["sim_ip"] = simProfile.serverIP.ToString(); |
537 | simProfileBlock["sim_port"] = simProfile.serverPort.ToString(); | 537 | simProfileBlock["sim_port"] = simProfile.serverPort.ToString(); |
538 | simProfileBlock["sim_uri"] = simProfile.serverURI.ToString(); | 538 | simProfileBlock["sim_uri"] = simProfile.serverURI.ToString(); |
539 | simProfileBlock["uuid"] = simProfile.UUID.ToStringHyphenated(); | 539 | simProfileBlock["uuid"] = simProfile.UUID.ToString(); |
540 | 540 | ||
541 | simProfileList.Add(simProfileBlock); | 541 | simProfileList.Add(simProfileBlock); |
542 | } | 542 | } |
@@ -721,7 +721,7 @@ namespace OpenSim.Grid.GridServer | |||
721 | { | 721 | { |
722 | kvp.Value.AddProfile(TheSim); | 722 | kvp.Value.AddProfile(TheSim); |
723 | MainLog.Instance.Verbose("grid", "New sim added to grid (" + TheSim.regionName + ")"); | 723 | MainLog.Instance.Verbose("grid", "New sim added to grid (" + TheSim.regionName + ")"); |
724 | logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, | 724 | logToDB(TheSim.UUID.ToString(), "RestSetSimMethod", "", 5, |
725 | "Region successfully updated and connected to grid."); | 725 | "Region successfully updated and connected to grid."); |
726 | } | 726 | } |
727 | else | 727 | else |