OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fixed bug where UserServer SendKey would not be saved in configuration.

afrisby
Adam Frisby 2007-07-15 14:21:17 +00:00
parent e207cc615f
commit 593851eaa5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/General/Types/NetworkServersInfo.cs
View File

@ -187,7 +187,7 @@ namespace OpenSim.Framework.Types
if (attri == "") if (attri == "")
{ {
this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server", "null"); this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server", "null");
configData.SetAttribute("GridRecvKey", this.UserRecvKey); configData.SetAttribute("UserRecvKey", this.UserRecvKey);
} }
else else
{ {

6
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -116,13 +116,13 @@ namespace OpenSim.Region.Communications.OGS1
uint regY = Convert.ToUInt32(n["y"]); uint regY = Convert.ToUInt32(n["y"]);
if ((regionInfo.RegionLocX != regX) || (regionInfo.RegionLocY != regY)) 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"]); uint port = Convert.ToUInt32(n["sim_port"]);
string externalUri = (string)n["sim_uri"]; 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; string neighbourExternalUri = externalUri;
RegionInfo neighbour = new RegionInfo(regX, regY, neighbourInternalEndPoint, internalIpStr); RegionInfo neighbour = new RegionInfo(regX, regY, neighbourInternalEndPoint, externalIpStr);
//OGS1 //OGS1
//neighbour.RegionHandle = (ulong)n["regionhandle"]; is now calculated locally //neighbour.RegionHandle = (ulong)n["regionhandle"]; is now calculated locally