diff options
author | Dahlia Trimble | 2009-01-18 10:50:53 +0000 |
---|---|---|
committer | Dahlia Trimble | 2009-01-18 10:50:53 +0000 |
commit | 37b63636eecabe3569f09781f4bb5b319cd85e24 (patch) | |
tree | a9f816b731d20d7083f67c07d3ed970b79ef21b6 /OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs | |
parent | Getting rid of the CheckRegion call during TPs. This seems to be not just use... (diff) | |
download | opensim-SC-37b63636eecabe3569f09781f4bb5b319cd85e24.zip opensim-SC-37b63636eecabe3569f09781f4bb5b319cd85e24.tar.gz opensim-SC-37b63636eecabe3569f09781f4bb5b319cd85e24.tar.bz2 opensim-SC-37b63636eecabe3569f09781f4bb5b319cd85e24.tar.xz |
Added an optional password for the IRC module
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs index 213ae96..8f1ad00 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs | |||
@@ -56,6 +56,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
56 | // default values (retained for compatability). | 56 | // default values (retained for compatability). |
57 | 57 | ||
58 | internal string Server = null; | 58 | internal string Server = null; |
59 | internal string Password = null; | ||
59 | internal string IrcChannel = null; | 60 | internal string IrcChannel = null; |
60 | internal string BaseNickname = "OSimBot"; | 61 | internal string BaseNickname = "OSimBot"; |
61 | internal uint Port = 6667; | 62 | internal uint Port = 6667; |
@@ -118,6 +119,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
118 | internal ChannelState(ChannelState model) | 119 | internal ChannelState(ChannelState model) |
119 | { | 120 | { |
120 | Server = model.Server; | 121 | Server = model.Server; |
122 | Password = model.Password; | ||
121 | IrcChannel = model.IrcChannel; | 123 | IrcChannel = model.IrcChannel; |
122 | Port = model.Port; | 124 | Port = model.Port; |
123 | BaseNickname = model.BaseNickname; | 125 | BaseNickname = model.BaseNickname; |
@@ -159,6 +161,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
159 | 161 | ||
160 | cs.Server = Substitute(rs, config.GetString("server", null)); | 162 | cs.Server = Substitute(rs, config.GetString("server", null)); |
161 | m_log.DebugFormat("[IRC-Channel-{0}] Server : <{1}>", cs.idn, cs.Server); | 163 | m_log.DebugFormat("[IRC-Channel-{0}] Server : <{1}>", cs.idn, cs.Server); |
164 | cs.Password = Substitute(rs, config.GetString("password", null)); | ||
165 | // probably not a good idea to put a password in the log file | ||
162 | cs.IrcChannel = Substitute(rs, config.GetString("channel", null)); | 166 | cs.IrcChannel = Substitute(rs, config.GetString("channel", null)); |
163 | m_log.DebugFormat("[IRC-Channel-{0}] IrcChannel : <{1}>", cs.idn, cs.IrcChannel); | 167 | m_log.DebugFormat("[IRC-Channel-{0}] IrcChannel : <{1}>", cs.idn, cs.IrcChannel); |
164 | cs.Port = Convert.ToUInt32(Substitute(rs, config.GetString("port", Convert.ToString(cs.Port)))); | 168 | cs.Port = Convert.ToUInt32(Substitute(rs, config.GetString("port", Convert.ToString(cs.Port)))); |