2 files changed, 25 insertions, 0 deletions

diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs
index 2859c25..5cef362 100644
--- a/OpenSim/Framework/MessageServerConfig.cs
+++ b/OpenSim/Framework/MessageServerConfig.cs
@@ -41,6 +41,10 @@ namespace OpenSim.Framework
         public string UserSendKey = "";
         public string UserRecvKey = "";
 
+        public string GridServerURL = "";
+        public string GridSendKey = "";
+        public string GridRecvKey = "";
+
         public string DatabaseProvider = "";
         public string GridCommsProvider = "";
 
@@ -68,6 +72,14 @@ namespace OpenSim.Framework
                                                 "Key to send to user server", "null", false);
             configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "Key to expect from user server", "null", false);
+            configMember.addConfigurationOption("default_grid_server",
+                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
+                                                "Default Grid Server URI",
+                                                "http://127.0.0.1:8002/", false);
+            configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
+                                                "Key to send to grid server", "null", false);
+            configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
+                                                "Key to expect from user server", "null", false);
 
             configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
@@ -96,6 +108,15 @@ namespace OpenSim.Framework
                 case "user_recv_key":
                     UserRecvKey = (string)configuration_result;
                     break;
+                case "default_grid_server":
+                    GridServerURL = (string)configuration_result;
+                    break;
+                case "grid_send_key":
+                    GridSendKey = (string)configuration_result;
+                    break;
+                case "grid_recv_key":
+                    GridRecvKey = (string)configuration_result;
+                    break;
                 case "database_provider":
                     DatabaseProvider = (string)configuration_result;
                     break;
diff --git a/OpenSim/Framework/Servers/MessageServerInfo.cs b/OpenSim/Framework/Servers/MessageServerInfo.cs
index 13d65f9..9d5fa8a 100644
--- a/OpenSim/Framework/Servers/MessageServerInfo.cs
+++ b/OpenSim/Framework/Servers/MessageServerInfo.cs
@@ -13,5 +13,9 @@ namespace OpenSim.Framework.Servers
         public MessageServerInfo()
         {
         }
+        public override string ToString()
+        {
+            return URI;
+        }
     }
 }