From 54e1d54fb52389980c724180f0c062205266f141 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sun, 1 Nov 2015 03:33:19 +0000
Subject:  fix more merge issues

---
 OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 10 +++++-----
 1 file 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
                     m_enabled = false;
                     return;
                 }
+ 
+            m_whisperdistance = m_config.GetInt("whisper_distance", m_whisperdistance);
+            m_saydistance = m_config.GetInt("say_distance", m_saydistance);
+            m_shoutdistance = m_config.GetInt("shout_distance", m_shoutdistance);
+            m_adminPrefix = m_config.GetString("admin_prefix", "");
             }
-
-            m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance);
-            m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance);
-            m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance);
-            m_adminPrefix = config.Configs["Chat"].GetString("admin_prefix", "");
         }
 
         public virtual void AddRegion(Scene scene)
-- 
cgit v1.1