From be93c0f29a888db26676347f7011b66dff3d7499 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sun, 13 Apr 2008 22:47:12 +0000
Subject: * Fix a bug in the friends module that causes a friend not to appear
 online when they were. * A few things for testing. * This makes a
 modification to the region registration with the grid server so that the
 region can send it a chosen password to identify itself.  It will not cause
 any errors, if either one are not updated.

---
 OpenSim/Grid/GridServer/GridManager.cs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Grid/GridServer/GridManager.cs')

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
 
             sim.regionRecvKey = String.Empty;
             sim.regionSendKey = String.Empty;
-            sim.regionSecret = Config.SimRecvKey;
+            
+            if (requestData.ContainsKey("region_secret"))
+            {
+                string regionsecret = (string)requestData["region_secret"];
+                if (regionsecret.Length > 0)
+                    sim.regionSecret = regionsecret;
+                else
+                    sim.regionSecret = Config.SimRecvKey;
+
+            }
+            else
+            {
+                sim.regionSecret = Config.SimRecvKey;
+            }
+            
+            
             sim.regionDataURI = String.Empty;
             sim.regionAssetURI = Config.DefaultAssetServer;
             sim.regionAssetRecvKey = Config.AssetRecvKey;
-- 
cgit v1.1