* 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.

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
 
             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;