diff options
| author | Dr Scofield | 2009-04-07 16:53:41 +0000 |
|---|---|---|
| committer | Dr Scofield | 2009-04-07 16:53:41 +0000 |
| commit | e540b66a8660ab2f3d3a9be153e8cf8aaa641714 (patch) | |
| tree | bd944353f4b0c773bdead689279496e5c15beb80 /OpenSim/Region | |
| parent | * Added finite testing to the character and object constructor (diff) | |
| download | opensim-SC_OLD-e540b66a8660ab2f3d3a9be153e8cf8aaa641714.zip opensim-SC_OLD-e540b66a8660ab2f3d3a9be153e8cf8aaa641714.tar.gz opensim-SC_OLD-e540b66a8660ab2f3d3a9be153e8cf8aaa641714.tar.bz2 opensim-SC_OLD-e540b66a8660ab2f3d3a9be153e8cf8aaa641714.tar.xz | |
From: Alan Webb <alan_webb@us.ibm.com>
Fix null reference exception during close down of IRC module if the
region was not actually initialized.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs index 0facc14..13874fa 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs | |||
| @@ -148,8 +148,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
| 148 | if (!enabled) | 148 | if (!enabled) |
| 149 | return; | 149 | return; |
| 150 | 150 | ||
| 151 | if (region == null) | ||
| 152 | return; | ||
| 153 | |||
| 151 | region.Close(); | 154 | region.Close(); |
| 152 | lock (m_regions) m_regions.Remove(region); | 155 | |
| 156 | if(m_regions.Contains(region)) | ||
| 157 | { | ||
| 158 | lock (m_regions) m_regions.Remove(region); | ||
| 159 | } | ||
| 160 | |||
| 153 | } | 161 | } |
| 154 | 162 | ||
| 155 | #endregion | 163 | #endregion |