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

* Made it so that if you don't specify a key, the defaults will not be assumed. 

* If you wish to turn off key authentication, set the values to "" (null) in the grid config, and do the same in clients.
ThreadPoolClientBranch
Adam Frisby 2008-01-12 19:28:50 +00:00
parent 0b0df333dc
commit f59f4e476d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Grid/GridServer/GridManager.cs
View File

@ -262,10 +262,10 @@ namespace OpenSim.Grid.GridServer
TheSim = new RegionProfileData();
TheSim.regionRecvKey = config.SimRecvKey;
TheSim.regionSendKey = config.SimSendKey;
TheSim.regionRecvKey = String.Empty;
TheSim.regionSendKey = String.Empty;
TheSim.regionSecret = config.SimRecvKey;
TheSim.regionDataURI = "";
TheSim.regionDataURI = String.Empty;
TheSim.regionAssetURI = config.DefaultAssetServer;
TheSim.regionAssetRecvKey = config.AssetRecvKey;
TheSim.regionAssetSendKey = config.AssetSendKey;
@ -289,7 +289,6 @@ namespace OpenSim.Grid.GridServer
}
catch (KeyNotFoundException) { }
TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256));
TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/";
@ -303,7 +302,9 @@ namespace OpenSim.Grid.GridServer
OldSim = getRegion(TheSim.regionHandle);
if (OldSim == null || OldSim.UUID == TheSim.UUID)
{
if (OldSim == null || (OldSim.regionRecvKey == TheSim.regionRecvKey &&
if ((OldSim == null && TheSim.regionRecvKey == config.SimSendKey &&
TheSim.regionRecvKey == config.SimRecvKey) ||
(OldSim.regionRecvKey == TheSim.regionRecvKey &&
OldSim.regionSendKey == TheSim.regionSendKey))
{
MainLog.Instance.Verbose("GRID", "Adding region " + TheSim.regionLocX + " , " + TheSim.regionLocY + " , " +