2 files changed, 12 insertions, 7 deletions

diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index e405b26..889f345 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -42,7 +42,6 @@ namespace OpenSim.Framework
         public string DatabaseConnect = String.Empty;
         public string DefaultAssetServer = String.Empty;
         public string DefaultUserServer = String.Empty;
-        public string GridOwner = String.Empty;
         public uint HttpPort = DefaultHttpPort;
         public string SimRecvKey = String.Empty;
         public string SimSendKey = String.Empty;
@@ -58,9 +57,6 @@ namespace OpenSim.Framework
 
         public void loadConfigurationOptions()
         {
-            configMember.addConfigurationOption("grid_owner",
-                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
-                                                "OGS Grid Owner", "OGS development team", false);
             configMember.addConfigurationOption("default_asset_server",
                                                 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                 "Default Asset Server URI",
@@ -101,9 +97,6 @@ namespace OpenSim.Framework
         {
             switch (configuration_key)
             {
-                case "grid_owner":
-                    GridOwner = (string) configuration_result;
-                    break;
                 case "default_asset_server":
                     DefaultAssetServer = (string) configuration_result;
                     break;
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index cb3365f..6cf526c 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -42,6 +42,8 @@ namespace OpenSim.Framework
         public string DefaultStartupMsg = String.Empty;
         public uint DefaultX = 1000;
         public uint DefaultY = 1000;
+        public string GridRecvKey = String.Empty;
+        public string GridSendKey = String.Empty;
         public uint HttpPort = DefaultHttpPort;
         public bool HttpSSL = DefaultHttpSSL;
 
@@ -96,6 +98,10 @@ namespace OpenSim.Framework
                                                 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                 "Default Grid Server URI",
                                                 "http://127.0.0.1:" + GridConfig.DefaultHttpPort + "/", 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 grid server", "null", false);
 
             configMember.addConfigurationOption("default_inventory_server",
                                                 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
@@ -129,6 +135,12 @@ namespace OpenSim.Framework
                 case "default_grid_server":
                     GridServerURL = new Uri( (string) configuration_result );
                     break;
+                case "grid_send_key":
+                    GridSendKey = (string) configuration_result;
+                    break;
+                case "grid_recv_key":
+                    GridRecvKey = (string) configuration_result;
+                    break;
                 case "default_inventory_server":
                     InventoryUrl = new Uri((string) configuration_result);
                     break;