diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/General/Types/NetworkServersInfo.cs | 2 | ||||
-rw-r--r-- | 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 21ff4b9..900354c 100644 --- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs +++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs | |||
@@ -187,7 +187,7 @@ namespace OpenSim.Framework.Types | |||
187 | if (attri == "") | 187 | if (attri == "") |
188 | { | 188 | { |
189 | this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server", "null"); | 189 | this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server", "null"); |
190 | configData.SetAttribute("GridRecvKey", this.UserRecvKey); | 190 | configData.SetAttribute("UserRecvKey", this.UserRecvKey); |
191 | } | 191 | } |
192 | else | 192 | else |
193 | { | 193 | { |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 2a73538..8456b6b 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -116,13 +116,13 @@ namespace OpenSim.Region.Communications.OGS1 | |||
116 | uint regY = Convert.ToUInt32(n["y"]); | 116 | uint regY = Convert.ToUInt32(n["y"]); |
117 | if ((regionInfo.RegionLocX != regX) || (regionInfo.RegionLocY != regY)) | 117 | if ((regionInfo.RegionLocX != regX) || (regionInfo.RegionLocY != regY)) |
118 | { | 118 | { |
119 | string internalIpStr = (string)n["sim_ip"]; | 119 | string externalIpStr = (string)n["sim_ip"]; |
120 | uint port = Convert.ToUInt32(n["sim_port"]); | 120 | uint port = Convert.ToUInt32(n["sim_port"]); |
121 | string externalUri = (string)n["sim_uri"]; | 121 | string externalUri = (string)n["sim_uri"]; |
122 | 122 | ||
123 | IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int)port); | 123 | IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(externalIpStr), (int)port); |
124 | string neighbourExternalUri = externalUri; | 124 | string neighbourExternalUri = externalUri; |
125 | RegionInfo neighbour = new RegionInfo(regX, regY, neighbourInternalEndPoint, internalIpStr); | 125 | RegionInfo neighbour = new RegionInfo(regX, regY, neighbourInternalEndPoint, externalIpStr); |
126 | 126 | ||
127 | //OGS1 | 127 | //OGS1 |
128 | //neighbour.RegionHandle = (ulong)n["regionhandle"]; is now calculated locally | 128 | //neighbour.RegionHandle = (ulong)n["regionhandle"]; is now calculated locally |