* Reinstate grid receive and send keys to user server config

* Looks like these weren't so unused after all - oops!
* Remove message from grid server config

3 files changed, 10 insertions, 14 deletions

diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index a8ebd27..d83027a 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Grid.GridServer
         {
             base.Startup();
 
-            Config();
+            m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml")));
 
             SetupGridManager();
 
@@ -132,11 +132,6 @@ namespace OpenSim.Grid.GridServer
             m_gridManager.Config = m_config;
         }
 
-        public void Config()
-        {
-            m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml")));
-        }
-
         public void CheckSims(object sender, ElapsedEventArgs e)
         {
             /*
diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Grid/GridServer/Program.cs
index 6eb4e15..8094906 100644
--- a/OpenSim/Grid/GridServer/Program.cs
+++ b/OpenSim/Grid/GridServer/Program.cs
@@ -39,15 +39,15 @@ namespace OpenSim.Grid.GridServer
 
             GridServerBase app = new GridServerBase();
 
-            if (args.Length > 0 && args[0] == "-setuponly")
-            {
-                app.Config();
-            }
-            else
-            {
+//            if (args.Length > 0 && args[0] == "-setuponly")
+//            {
+//                app.Config();
+//            }
+//            else
+//            {
                 app.Startup();
                 app.Work();
-            }
+//            }
         }
     }
 }
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 59af373..191e482 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -72,18 +72,19 @@ namespace OpenSim.Grid.UserServer
                 SimInfo = RegionProfileData.RequestSimProfileData(
                                 theUser.CurrentAgent.Handle, m_config.GridServerURL,
                                 m_config.GridSendKey, m_config.GridRecvKey);
+                
                 if (SimInfo == null)
                 {
                     m_log.Error("[GRID]: Region user was in isn't currently logged in");
                     return;
                 }
-
             }
             catch (Exception)
             {
                 m_log.Error("[GRID]: Unable to look up region to log user off");
                 return;
             }
+            
             // Prepare notification
             Hashtable SimParams = new Hashtable();
             SimParams["agent_id"] = theUser.ID.ToString();