From 593851eaa59adf7f1970b522dd89b95a457ed011 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Sun, 15 Jul 2007 14:21:17 +0000 Subject: [PATCH] * Fixed bug where UserServer SendKey would not be saved in configuration. --- OpenSim/Framework/General/Types/NetworkServersInfo.cs | 2 +- OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs index 21ff4b9e19..900354c513 100644 --- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs +++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs @@ -187,7 +187,7 @@ namespace OpenSim.Framework.Types if (attri == "") { this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server", "null"); - configData.SetAttribute("GridRecvKey", this.UserRecvKey); + configData.SetAttribute("UserRecvKey", this.UserRecvKey); } else { diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 2a73538aaf..8456b6b081 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs @@ -116,13 +116,13 @@ namespace OpenSim.Region.Communications.OGS1 uint regY = Convert.ToUInt32(n["y"]); if ((regionInfo.RegionLocX != regX) || (regionInfo.RegionLocY != regY)) { - string internalIpStr = (string)n["sim_ip"]; + string externalIpStr = (string)n["sim_ip"]; uint port = Convert.ToUInt32(n["sim_port"]); string externalUri = (string)n["sim_uri"]; - IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int)port); + IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(externalIpStr), (int)port); string neighbourExternalUri = externalUri; - RegionInfo neighbour = new RegionInfo(regX, regY, neighbourInternalEndPoint, internalIpStr); + RegionInfo neighbour = new RegionInfo(regX, regY, neighbourInternalEndPoint, externalIpStr); //OGS1 //neighbour.RegionHandle = (ulong)n["regionhandle"]; is now calculated locally