aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2008-01-12 19:28:50 +0000
committerAdam Frisby2008-01-12 19:28:50 +0000
commitf59f4e476dbbf9dca32419ecf69ab17cc99cb2f6 (patch)
tree641346e520575f86869ab742f1f449da2191d954
parent* In the interests of making life difficult for everyone, the Grid Server now... (diff)
downloadopensim-SC_OLD-f59f4e476dbbf9dca32419ecf69ab17cc99cb2f6.zip
opensim-SC_OLD-f59f4e476dbbf9dca32419ecf69ab17cc99cb2f6.tar.gz
opensim-SC_OLD-f59f4e476dbbf9dca32419ecf69ab17cc99cb2f6.tar.bz2
opensim-SC_OLD-f59f4e476dbbf9dca32419ecf69ab17cc99cb2f6.tar.xz
* 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.
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 6af0767..1e21d9e 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -262,10 +262,10 @@ namespace OpenSim.Grid.GridServer
262 262
263 TheSim = new RegionProfileData(); 263 TheSim = new RegionProfileData();
264 264
265 TheSim.regionRecvKey = config.SimRecvKey; 265 TheSim.regionRecvKey = String.Empty;
266 TheSim.regionSendKey = config.SimSendKey; 266 TheSim.regionSendKey = String.Empty;
267 TheSim.regionSecret = config.SimRecvKey; 267 TheSim.regionSecret = config.SimRecvKey;
268 TheSim.regionDataURI = ""; 268 TheSim.regionDataURI = String.Empty;
269 TheSim.regionAssetURI = config.DefaultAssetServer; 269 TheSim.regionAssetURI = config.DefaultAssetServer;
270 TheSim.regionAssetRecvKey = config.AssetRecvKey; 270 TheSim.regionAssetRecvKey = config.AssetRecvKey;
271 TheSim.regionAssetSendKey = config.AssetSendKey; 271 TheSim.regionAssetSendKey = config.AssetSendKey;
@@ -289,7 +289,6 @@ namespace OpenSim.Grid.GridServer
289 } 289 }
290 catch (KeyNotFoundException) { } 290 catch (KeyNotFoundException) { }
291 291
292
293 TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256)); 292 TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256));
294 TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/"; 293 TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/";
295 294
@@ -303,7 +302,9 @@ namespace OpenSim.Grid.GridServer
303 OldSim = getRegion(TheSim.regionHandle); 302 OldSim = getRegion(TheSim.regionHandle);
304 if (OldSim == null || OldSim.UUID == TheSim.UUID) 303 if (OldSim == null || OldSim.UUID == TheSim.UUID)
305 { 304 {
306 if (OldSim == null || (OldSim.regionRecvKey == TheSim.regionRecvKey && 305 if ((OldSim == null && TheSim.regionRecvKey == config.SimSendKey &&
306 TheSim.regionRecvKey == config.SimRecvKey) ||
307 (OldSim.regionRecvKey == TheSim.regionRecvKey &&
307 OldSim.regionSendKey == TheSim.regionSendKey)) 308 OldSim.regionSendKey == TheSim.regionSendKey))
308 { 309 {
309 MainLog.Instance.Verbose("GRID", "Adding region " + TheSim.regionLocX + " , " + TheSim.regionLocY + " , " + 310 MainLog.Instance.Verbose("GRID", "Adding region " + TheSim.regionLocX + " , " + TheSim.regionLocY + " , " +