aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid/GridServer')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs17
1 files changed, 16 insertions, 1 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 7b41f6e..ba526c0 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -530,7 +530,22 @@ namespace OpenSim.Grid.GridServer
530 530
531 sim.regionRecvKey = String.Empty; 531 sim.regionRecvKey = String.Empty;
532 sim.regionSendKey = String.Empty; 532 sim.regionSendKey = String.Empty;
533 sim.regionSecret = Config.SimRecvKey; 533
534 if (requestData.ContainsKey("region_secret"))
535 {
536 string regionsecret = (string)requestData["region_secret"];
537 if (regionsecret.Length > 0)
538 sim.regionSecret = regionsecret;
539 else
540 sim.regionSecret = Config.SimRecvKey;
541
542 }
543 else
544 {
545 sim.regionSecret = Config.SimRecvKey;
546 }
547
548
534 sim.regionDataURI = String.Empty; 549 sim.regionDataURI = String.Empty;
535 sim.regionAssetURI = Config.DefaultAssetServer; 550 sim.regionAssetURI = Config.DefaultAssetServer;
536 sim.regionAssetRecvKey = Config.AssetRecvKey; 551 sim.regionAssetRecvKey = Config.AssetRecvKey;