diff options
author | Melanie Thielker | 2009-04-01 12:28:46 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-04-01 12:28:46 +0000 |
commit | a1fe54baa0d3610da5e4c2821b48d0a4c9390bd5 (patch) | |
tree | e884166da240f7b01c37924eb36d018190b1fe60 | |
parent | Add a PIDFile in [Startup], which the PID will be written to (diff) | |
download | opensim-SC-a1fe54baa0d3610da5e4c2821b48d0a4c9390bd5.zip opensim-SC-a1fe54baa0d3610da5e4c2821b48d0a4c9390bd5.tar.gz opensim-SC-a1fe54baa0d3610da5e4c2821b48d0a4c9390bd5.tar.bz2 opensim-SC-a1fe54baa0d3610da5e4c2821b48d0a4c9390bd5.tar.xz |
Add a "user" config option to the IRC module config. Like all other IRC
config options, this has NO default, if you use the IRC module, you MUST
add this setting to your ini file.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs | 3 | ||||
-rw-r--r-- | bin/OpenSim.ini.example | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs index 167f0cc..2f3de69 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs | |||
@@ -60,7 +60,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
60 | internal string IrcChannel = null; | 60 | internal string IrcChannel = null; |
61 | internal string BaseNickname = "OSimBot"; | 61 | internal string BaseNickname = "OSimBot"; |
62 | internal uint Port = 6667; | 62 | internal uint Port = 6667; |
63 | internal string User = "USER OpenSimBot 8 * :I'm an OpenSim to IRC bot"; | 63 | internal string User = null; |
64 | 64 | ||
65 | internal bool ClientReporting = true; | 65 | internal bool ClientReporting = true; |
66 | internal bool RelayChat = true; | 66 | internal bool RelayChat = true; |
@@ -163,6 +163,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
163 | 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)); | 164 | cs.Password = Substitute(rs, config.GetString("password", null)); |
165 | // probably not a good idea to put a password in the log file | 165 | // probably not a good idea to put a password in the log file |
166 | cs.User = Substitute(rs, config.GetString("user", null)); | ||
166 | cs.IrcChannel = Substitute(rs, config.GetString("channel", null)); | 167 | cs.IrcChannel = Substitute(rs, config.GetString("channel", null)); |
167 | m_log.DebugFormat("[IRC-Channel-{0}] IrcChannel : <{1}>", cs.idn, cs.IrcChannel); | 168 | m_log.DebugFormat("[IRC-Channel-{0}] IrcChannel : <{1}>", cs.idn, cs.IrcChannel); |
168 | cs.Port = Convert.ToUInt32(Substitute(rs, config.GetString("port", Convert.ToString(cs.Port)))); | 169 | cs.Port = Convert.ToUInt32(Substitute(rs, config.GetString("port", Convert.ToString(cs.Port)))); |
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 7b2d370..5967ff0 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -604,6 +604,7 @@ | |||
604 | ;password = mypass | 604 | ;password = mypass |
605 | ;nick = OpenSimBotNameProbablyMakeThisShorter | 605 | ;nick = OpenSimBotNameProbablyMakeThisShorter |
606 | ;channel = #the_irc_channel_you_want_to_connect_to | 606 | ;channel = #the_irc_channel_you_want_to_connect_to |
607 | ;user = "OpenSimBot 8 * :I'm an OpenSim to IRC bot" | ||
607 | ;port = 6667 | 608 | ;port = 6667 |
608 | ;; channel to listen for configuration commands | 609 | ;; channel to listen for configuration commands |
609 | ;commands_enabled = false | 610 | ;commands_enabled = false |