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

* Fixed reservation handling for existing region authkey situations. Reservation key now overrides old sim key, however if reservation not found, sim key is used instead.

Sugilite
Adam Frisby 2007-07-08 00:54:13 +00:00
parent c617cf7d84
commit 7b0bb7c616
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -602,12 +602,6 @@ namespace OpenSim.Grid.GridServer
return "ERROR! bad XML - expected sim tag"; return "ERROR! bad XML - expected sim tag";
} }
if (authkeynode.InnerText != TheSim.regionRecvKey)
{
MainLog.Instance.Warn("Invalid Key Attempt on region update");
return "ERROR! invalid key";
}
//TheSim.regionSendKey = Cfg; //TheSim.regionSendKey = Cfg;
TheSim.regionRecvKey = config.SimRecvKey; TheSim.regionRecvKey = config.SimRecvKey;
TheSim.regionSendKey = config.SimSendKey; TheSim.regionSendKey = config.SimSendKey;
@ -668,7 +662,7 @@ namespace OpenSim.Grid.GridServer
{ {
//Check reservations //Check reservations
ReservationData reserveData = kvp.Value.GetReservationAtPoint(TheSim.regionLocX, TheSim.regionLocY); ReservationData reserveData = kvp.Value.GetReservationAtPoint(TheSim.regionLocX, TheSim.regionLocY);
if ((reserveData != null && reserveData.gridRecvKey == TheSim.regionRecvKey) || (reserveData == null)) if ((reserveData != null && reserveData.gridRecvKey == TheSim.regionRecvKey) || (reserveData == null && authkeynode.InnerText != TheSim.regionRecvKey))
{ {
kvp.Value.AddProfile(TheSim); kvp.Value.AddProfile(TheSim);
MainLog.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")"); MainLog.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")");