diff options
| author | Justin Clark-Casey (justincc) | 2010-01-11 21:00:28 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-01-11 21:00:28 +0000 |
| commit | 07aaad0d1083ea25d99c77e21bc40ee8c36b8cb1 (patch) | |
| tree | ac6be7b5eef574b248975be000bf0e419562a1e0 /OpenSim | |
| parent | add interface/method documentatio nto IScriptModuleComms (diff) | |
| parent | more specific config error logging (diff) | |
| download | opensim-SC_OLD-07aaad0d1083ea25d99c77e21bc40ee8c36b8cb1.zip opensim-SC_OLD-07aaad0d1083ea25d99c77e21bc40ee8c36b8cb1.tar.gz opensim-SC_OLD-07aaad0d1083ea25d99c77e21bc40ee8c36b8cb1.tar.bz2 opensim-SC_OLD-07aaad0d1083ea25d99c77e21bc40ee8c36b8cb1.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs index 3c5e8c9..b3fa07f 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs | |||
| @@ -220,8 +220,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
| 220 | 220 | ||
| 221 | // Fail if fundamental information is still missing | 221 | // Fail if fundamental information is still missing |
| 222 | 222 | ||
| 223 | if (cs.Server == null || cs.IrcChannel == null || cs.BaseNickname == null || cs.User == null) | 223 | if (cs.Server == null) |
| 224 | throw new Exception(String.Format("[IRC-Channel-{0}] Invalid configuration for region {1}", cs.idn, rs.Region)); | 224 | throw new Exception(String.Format("[IRC-Channel-{0}] Invalid configuration for region {1}: server missing", cs.idn, rs.Region)); |
| 225 | else if (cs.IrcChannel == null) | ||
| 226 | throw new Exception(String.Format("[IRC-Channel-{0}] Invalid configuration for region {1}: channel missing", cs.idn, rs.Region)); | ||
| 227 | else if (cs.BaseNickname == null) | ||
| 228 | throw new Exception(String.Format("[IRC-Channel-{0}] Invalid configuration for region {1}: nick missing", cs.idn, rs.Region)); | ||
| 229 | else if (cs.User == null) | ||
| 230 | throw new Exception(String.Format("[IRC-Channel-{0}] Invalid configuration for region {1}: user missing", cs.idn, rs.Region)); | ||
| 225 | 231 | ||
| 226 | m_log.InfoFormat("[IRC-Channel-{0}] Configuration for Region {1} is valid", cs.idn, rs.Region); | 232 | m_log.InfoFormat("[IRC-Channel-{0}] Configuration for Region {1} is valid", cs.idn, rs.Region); |
| 227 | m_log.InfoFormat("[IRC-Channel-{0}] Server = {1}", cs.idn, cs.Server); | 233 | m_log.InfoFormat("[IRC-Channel-{0}] Server = {1}", cs.idn, cs.Server); |