From dd0234f5005127c03760c2b9862ed1672f4a2e91 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 19 Aug 2009 05:15:25 +0100
Subject: Graft the REST console onto the grid server. Same procedure as with
 the user server.

---
 OpenSim/Framework/GridConfig.cs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework/GridConfig.cs')

diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index a3c1032..87fd3f0 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -45,6 +45,8 @@ namespace OpenSim.Framework
         public string SimSendKey = String.Empty;
         public string UserRecvKey = String.Empty;
         public string UserSendKey = String.Empty;
+        public string ConsoleUser = String.Empty;
+        public string ConsolePass = String.Empty;
 
         public GridConfig(string description, string filename)
         {
@@ -95,6 +97,12 @@ namespace OpenSim.Framework
                                                 "Allow regions to register immediately upon grid server startup? true/false", 
                                                 "True", 
                                                 false);            
+            m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
+                                                 "Remote console access user name [Default: disabled]", "0", false);
+
+            m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
+                                                 "Remote console access password [Default: disabled]", "0", false);
+
         }
 
         public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -140,9 +148,15 @@ namespace OpenSim.Framework
                 case "allow_region_registration":
                     AllowRegionRegistration = (bool)configuration_result;
                     break;                
+                case "console_user":
+                    ConsoleUser = (string)configuration_result;
+                    break;
+                case "console_pass":
+                    ConsolePass = (string)configuration_result;
+                    break;
             }
 
             return true;
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1


From 70c870972a4b534f38eaa3ae1c9b076b472f7d75 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 21 Aug 2009 00:25:50 +0100
Subject: Fix the user and password defaults int he remote console setup

---
 OpenSim/Framework/GridConfig.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework/GridConfig.cs')

diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index 87fd3f0..9aa5d03 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -98,10 +98,10 @@ namespace OpenSim.Framework
                                                 "True", 
                                                 false);            
             m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                 "Remote console access user name [Default: disabled]", "0", false);
+                                                 "Remote console access user name [Default: disabled]", "", false);
 
             m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                 "Remote console access password [Default: disabled]", "0", false);
+                                                 "Remote console access password [Default: disabled]", "", false);
 
         }
 
-- 
cgit v1.1