OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't let a missing configuration cause a NRE 

Fixes Mantis #3355
0.6.5-rc1
Melanie Thielker 2009-03-29 15:24:50 +00:00
parent 03063375ee
commit d857cf1335
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
View File

@ -53,6 +53,12 @@ namespace OpenSim.Region.CoreModules.Avatar.MuteList
return; return;
IConfig cnf = config.Configs["Messaging"]; IConfig cnf = config.Configs["Messaging"];
if (cnf == null)
{
enabled = false;
return;
}
if (cnf != null && cnf.GetString( if (cnf != null && cnf.GetString(
"MuteListModule", "None") != "MuteListModule", "None") !=
"MuteListModule") "MuteListModule")

5
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
View File

@ -53,6 +53,11 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
return; return;
IConfig cnf = config.Configs["Messaging"]; IConfig cnf = config.Configs["Messaging"];
if (cnf == null)
{
enabled = false;
return;
}
if (cnf != null && cnf.GetString( if (cnf != null && cnf.GetString(
"OfflineMessageModule", "None") != "OfflineMessageModule", "None") !=
"OfflineMessageModule") "OfflineMessageModule")