diff options
| author | Justin Clarke Casey | 2008-05-30 16:16:03 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-05-30 16:16:03 +0000 |
| commit | 6265ea371ecf7544c9e6635fd7ee44a93c9c604d (patch) | |
| tree | 2b5731278930245b9ef1f5a1e78ab2e562dd3155 | |
| parent | * Successfully pick out prims.xml file from archive (diff) | |
| download | opensim-SC_OLD-6265ea371ecf7544c9e6635fd7ee44a93c9c604d.zip opensim-SC_OLD-6265ea371ecf7544c9e6635fd7ee44a93c9c604d.tar.gz opensim-SC_OLD-6265ea371ecf7544c9e6635fd7ee44a93c9c604d.tar.bz2 opensim-SC_OLD-6265ea371ecf7544c9e6635fd7ee44a93c9c604d.tar.xz | |
* Stop the IRC module throwing a nre on shutdown if it isn't actually being used
| -rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs index a7abfb4..7ee7eda 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs | |||
| @@ -150,8 +150,11 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
| 150 | 150 | ||
| 151 | public void Close() | 151 | public void Close() |
| 152 | { | 152 | { |
| 153 | m_irc.Close(); | 153 | if (null != m_irc) |
| 154 | m_log.Info("[IRC] closed connection to IRC server"); | 154 | { |
| 155 | m_irc.Close(); | ||
| 156 | m_log.Info("[IRC] closed connection to IRC server"); | ||
| 157 | } | ||
| 155 | } | 158 | } |
| 156 | 159 | ||
| 157 | public string Name | 160 | public string Name |