diff options
| author | Adam Frisby | 2009-08-21 11:15:48 +1000 |
|---|---|---|
| committer | Adam Frisby | 2009-08-21 11:15:48 +1000 |
| commit | 1740fd60b366ae797989e13796cdb413b1efd00f (patch) | |
| tree | 1b3c41212514f605ab2e15b307f91089f610de08 /OpenSim/Framework | |
| parent | * Fleshes more of NPCModule out. (diff) | |
| parent | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-1740fd60b366ae797989e13796cdb413b1efd00f.zip opensim-SC_OLD-1740fd60b366ae797989e13796cdb413b1efd00f.tar.gz opensim-SC_OLD-1740fd60b366ae797989e13796cdb413b1efd00f.tar.bz2 opensim-SC_OLD-1740fd60b366ae797989e13796cdb413b1efd00f.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/GridConfig.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Framework/MessageServerConfig.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Framework/UserConfig.cs | 4 |
3 files changed, 6 insertions, 6 deletions
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 | |||
| 98 | "True", | 98 | "True", |
| 99 | false); | 99 | false); |
| 100 | m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 100 | m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
| 101 | "Remote console access user name [Default: disabled]", "0", false); | 101 | "Remote console access user name [Default: disabled]", "", false); |
| 102 | 102 | ||
| 103 | m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 103 | m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
| 104 | "Remote console access password [Default: disabled]", "0", false); | 104 | "Remote console access password [Default: disabled]", "", false); |
| 105 | 105 | ||
| 106 | } | 106 | } |
| 107 | 107 | ||
diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs index 61e5ea7..884c0ea 100644 --- a/OpenSim/Framework/MessageServerConfig.cs +++ b/OpenSim/Framework/MessageServerConfig.cs | |||
| @@ -91,10 +91,10 @@ namespace OpenSim.Framework | |||
| 91 | m_configMember.addConfigurationOption("published_ip", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 91 | m_configMember.addConfigurationOption("published_ip", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
| 92 | "My Published IP Address", "127.0.0.1", false); | 92 | "My Published IP Address", "127.0.0.1", false); |
| 93 | m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 93 | m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
| 94 | "Remote console access user name [Default: disabled]", "0", false); | 94 | "Remote console access user name [Default: disabled]", "", false); |
| 95 | 95 | ||
| 96 | m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 96 | m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
| 97 | "Remote console access password [Default: disabled]", "0", false); | 97 | "Remote console access password [Default: disabled]", "", false); |
| 98 | 98 | ||
| 99 | } | 99 | } |
| 100 | 100 | ||
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 | |||
| 158 | "Minimum Level a user should have to login [0 default]", "0", false); | 158 | "Minimum Level a user should have to login [0 default]", "0", false); |
| 159 | 159 | ||
| 160 | m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 160 | m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
| 161 | "Remote console access user name [Default: disabled]", "0", false); | 161 | "Remote console access user name [Default: disabled]", "", false); |
| 162 | 162 | ||
| 163 | m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 163 | m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
| 164 | "Remote console access password [Default: disabled]", "0", false); | 164 | "Remote console access password [Default: disabled]", "", false); |
| 165 | 165 | ||
| 166 | } | 166 | } |
| 167 | 167 | ||