aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDr Scofield2008-05-27 13:16:44 +0000
committerDr Scofield2008-05-27 13:16:44 +0000
commit1d3d739da4607df875b7fae85664055468486e11 (patch)
tree27ab605530e78c723e02b6a2502736f566ad143c /OpenSim/Region
parentcleaning up: coding style guidelines violation in RestPlugin.cs. (diff)
downloadopensim-SC_OLD-1d3d739da4607df875b7fae85664055468486e11.zip
opensim-SC_OLD-1d3d739da4607df875b7fae85664055468486e11.tar.gz
opensim-SC_OLD-1d3d739da4607df875b7fae85664055468486e11.tar.bz2
opensim-SC_OLD-1d3d739da4607df875b7fae85664055468486e11.tar.xz
fixes a CTB when IRCBridgeModule is not configured.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
index 156c2fd..c8d5f80 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
85 m_log.Info("[IRC] module not configured"); 85 m_log.Info("[IRC] module not configured");
86 return; 86 return;
87 } 87 }
88 88
89 lock (m_syncInit) 89 lock (m_syncInit)
90 { 90 {
91 91
@@ -125,7 +125,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
125 125
126 public void PostInitialise() 126 public void PostInitialise()
127 { 127 {
128 if (!m_irc.Enabled) return; 128 if (null == m_irc || !m_irc.Enabled) return;
129 129
130 try 130 try
131 { 131 {