aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorSean Dague2007-10-22 03:22:27 +0000
committerSean Dague2007-10-22 03:22:27 +0000
commite0f43cad4b86ff5810fef665dec55ac6868dee38 (patch)
treed32e2bcc18cb79d03eba443b425babc12863d045 /OpenSim/Region
parentpull the IRC portions into their own class. There is still (diff)
downloadopensim-SC-e0f43cad4b86ff5810fef665dec55ac6868dee38.zip
opensim-SC-e0f43cad4b86ff5810fef665dec55ac6868dee38.tar.gz
opensim-SC-e0f43cad4b86ff5810fef665dec55ac6868dee38.tar.bz2
opensim-SC-e0f43cad4b86ff5810fef665dec55ac6868dee38.tar.xz
update so that distances aren't required in the config file
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Modules/ChatModule.cs11
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index 4ead398..abd770a 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -58,10 +58,13 @@ namespace OpenSim.Region.Environment.Modules
58 58
59 public void Initialise(Scene scene, Nini.Config.IConfigSource config) 59 public void Initialise(Scene scene, Nini.Config.IConfigSource config)
60 { 60 {
61 61 // wrap this in a try block so that defaults will work if
62 m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance"); 62 // the config file doesn't specify otherwise.
63 m_saydistance = config.Configs["Chat"].GetInt("say_distance"); 63 try {
64 m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance"); 64 m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance);
65 m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance);
66 m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance);
67 } catch (Exception e) {}
65 68
66 if (!m_scenes.Contains(scene)) 69 if (!m_scenes.Contains(scene))
67 { 70 {