diff options
| author | UbitUmarov | 2015-11-01 03:33:19 +0000 |
|---|---|---|
| committer | UbitUmarov | 2015-11-01 03:33:19 +0000 |
| commit | 54e1d54fb52389980c724180f0c062205266f141 (patch) | |
| tree | 2ee86544ef4c8fefd7354ade0c09f66986142a14 /OpenSim | |
| parent | fix merge issues (diff) | |
| download | opensim-SC_OLD-54e1d54fb52389980c724180f0c062205266f141.zip opensim-SC_OLD-54e1d54fb52389980c724180f0c062205266f141.tar.gz opensim-SC_OLD-54e1d54fb52389980c724180f0c062205266f141.tar.bz2 opensim-SC_OLD-54e1d54fb52389980c724180f0c062205266f141.tar.xz | |
fix more merge issues
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index 0472f31..d83713b 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |||
| @@ -71,12 +71,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
| 71 | m_enabled = false; | 71 | m_enabled = false; |
| 72 | return; | 72 | return; |
| 73 | } | 73 | } |
| 74 | |||
| 75 | m_whisperdistance = m_config.GetInt("whisper_distance", m_whisperdistance); | ||
| 76 | m_saydistance = m_config.GetInt("say_distance", m_saydistance); | ||
| 77 | m_shoutdistance = m_config.GetInt("shout_distance", m_shoutdistance); | ||
| 78 | m_adminPrefix = m_config.GetString("admin_prefix", ""); | ||
| 74 | } | 79 | } |
| 75 | |||
| 76 | m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance); | ||
| 77 | m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance); | ||
| 78 | m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance); | ||
| 79 | m_adminPrefix = config.Configs["Chat"].GetString("admin_prefix", ""); | ||
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | public virtual void AddRegion(Scene scene) | 82 | public virtual void AddRegion(Scene scene) |