aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2007-07-08 00:54:13 +0000
committerAdam Frisby2007-07-08 00:54:13 +0000
commit7b0bb7c616fcbbd06b3eb5154fa83479036101c8 (patch)
tree972a16872ee14047cc3f3345508063755e126f13
parentxmlm utf encoding, it's a jungle. (diff)
downloadopensim-SC_OLD-7b0bb7c616fcbbd06b3eb5154fa83479036101c8.zip
opensim-SC_OLD-7b0bb7c616fcbbd06b3eb5154fa83479036101c8.tar.gz
opensim-SC_OLD-7b0bb7c616fcbbd06b3eb5154fa83479036101c8.tar.bz2
opensim-SC_OLD-7b0bb7c616fcbbd06b3eb5154fa83479036101c8.tar.xz
* 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.
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs8
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 814d7c1..06e83f8 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -602,12 +602,6 @@ namespace OpenSim.Grid.GridServer
602 return "ERROR! bad XML - expected sim tag"; 602 return "ERROR! bad XML - expected sim tag";
603 } 603 }
604 604
605 if (authkeynode.InnerText != TheSim.regionRecvKey)
606 {
607 MainLog.Instance.Warn("Invalid Key Attempt on region update");
608 return "ERROR! invalid key";
609 }
610
611 //TheSim.regionSendKey = Cfg; 605 //TheSim.regionSendKey = Cfg;
612 TheSim.regionRecvKey = config.SimRecvKey; 606 TheSim.regionRecvKey = config.SimRecvKey;
613 TheSim.regionSendKey = config.SimSendKey; 607 TheSim.regionSendKey = config.SimSendKey;
@@ -668,7 +662,7 @@ namespace OpenSim.Grid.GridServer
668 { 662 {
669 //Check reservations 663 //Check reservations
670 ReservationData reserveData = kvp.Value.GetReservationAtPoint(TheSim.regionLocX, TheSim.regionLocY); 664 ReservationData reserveData = kvp.Value.GetReservationAtPoint(TheSim.regionLocX, TheSim.regionLocY);
671 if ((reserveData != null && reserveData.gridRecvKey == TheSim.regionRecvKey) || (reserveData == null)) 665 if ((reserveData != null && reserveData.gridRecvKey == TheSim.regionRecvKey) || (reserveData == null && authkeynode.InnerText != TheSim.regionRecvKey))
672 { 666 {
673 kvp.Value.AddProfile(TheSim); 667 kvp.Value.AddProfile(TheSim);
674 MainLog.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")"); 668 MainLog.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")");