diff options
Diffstat (limited to 'OpenSim/Framework/GridConfig.cs')
-rw-r--r-- | OpenSim/Framework/GridConfig.cs | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs index a3c1032..9aa5d03 100644 --- a/OpenSim/Framework/GridConfig.cs +++ b/OpenSim/Framework/GridConfig.cs | |||
@@ -45,6 +45,8 @@ namespace OpenSim.Framework | |||
45 | public string SimSendKey = String.Empty; | 45 | public string SimSendKey = String.Empty; |
46 | public string UserRecvKey = String.Empty; | 46 | public string UserRecvKey = String.Empty; |
47 | public string UserSendKey = String.Empty; | 47 | public string UserSendKey = String.Empty; |
48 | public string ConsoleUser = String.Empty; | ||
49 | public string ConsolePass = String.Empty; | ||
48 | 50 | ||
49 | public GridConfig(string description, string filename) | 51 | public GridConfig(string description, string filename) |
50 | { | 52 | { |
@@ -95,6 +97,12 @@ namespace OpenSim.Framework | |||
95 | "Allow regions to register immediately upon grid server startup? true/false", | 97 | "Allow regions to register immediately upon grid server startup? true/false", |
96 | "True", | 98 | "True", |
97 | false); | 99 | false); |
100 | m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | ||
101 | "Remote console access user name [Default: disabled]", "", false); | ||
102 | |||
103 | m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | ||
104 | "Remote console access password [Default: disabled]", "", false); | ||
105 | |||
98 | } | 106 | } |
99 | 107 | ||
100 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) | 108 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) |
@@ -140,9 +148,15 @@ namespace OpenSim.Framework | |||
140 | case "allow_region_registration": | 148 | case "allow_region_registration": |
141 | AllowRegionRegistration = (bool)configuration_result; | 149 | AllowRegionRegistration = (bool)configuration_result; |
142 | break; | 150 | break; |
151 | case "console_user": | ||
152 | ConsoleUser = (string)configuration_result; | ||
153 | break; | ||
154 | case "console_pass": | ||
155 | ConsolePass = (string)configuration_result; | ||
156 | break; | ||
143 | } | 157 | } |
144 | 158 | ||
145 | return true; | 159 | return true; |
146 | } | 160 | } |
147 | } | 161 | } |
148 | } \ No newline at end of file | 162 | } |