From 99c7a43ffdb9c3b4dee984f7cd788742c6ee3e53 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 19 Aug 2009 04:39:02 +0100
Subject: Add rest console support to the user server. Will ask new questions
 at startup. To use, run it normally once, answering the questions, then run
 again with -console=rest. Also now supports -console=basic for a console that
 reads stdin

---
 OpenSim/Framework/UserConfig.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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

diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index 31838ad..b9e3665 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -46,6 +46,8 @@ namespace OpenSim.Framework
         public bool HttpSSL = ConfigSettings.DefaultUserServerHttpSSL;
         public uint DefaultUserLevel = 0;
         public string LibraryXmlfile = "";
+        public string ConsoleUser = String.Empty;
+        public string ConsolePass = String.Empty;
 
         private Uri m_inventoryUrl;
 
@@ -155,6 +157,12 @@ namespace OpenSim.Framework
             m_configMember.addConfigurationOption("default_loginLevel", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
                                                 "Minimum Level a user should have to login [0 default]", "0", 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)
@@ -209,6 +217,12 @@ namespace OpenSim.Framework
                 case "library_location":
                     LibraryXmlfile = (string)configuration_result;
                     break;
+                case "console_user":
+                    ConsoleUser = (string)configuration_result;
+                    break;
+                case "console_pass":
+                    ConsolePass = (string)configuration_result;
+                    break;
             }
 
             return true;
-- 
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/UserConfig.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index b9e3665..16f265c 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -158,10 +158,10 @@ namespace OpenSim.Framework
                                                 "Minimum Level a user should have to login [0 default]", "0", 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