diff options
| author | Adam Frisby | 2007-07-15 14:21:17 +0000 |
|---|---|---|
| committer | Adam Frisby | 2007-07-15 14:21:17 +0000 |
| commit | 593851eaa59adf7f1970b522dd89b95a457ed011 (patch) | |
| tree | b0a739970fc21ab3349d0e1ab34bbb2adac0d325 /OpenSim/Region | |
| parent | * fixed locations both set to y (thanks to babblefro) (diff) | |
| download | opensim-SC_OLD-593851eaa59adf7f1970b522dd89b95a457ed011.zip opensim-SC_OLD-593851eaa59adf7f1970b522dd89b95a457ed011.tar.gz opensim-SC_OLD-593851eaa59adf7f1970b522dd89b95a457ed011.tar.bz2 opensim-SC_OLD-593851eaa59adf7f1970b522dd89b95a457ed011.tar.xz | |
* Fixed bug where UserServer SendKey would not be saved in configuration.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 6 |
1 files changed, 3 insertions, 3 deletions
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 |