From a339598bad5cee488a6c31494065fc6910300ad1 Mon Sep 17 00:00:00 2001
From: Dan Lake <dan.lake@intel.com>
Date: Thu, 6 Jan 2011 17:32:10 -0800
Subject: [PATCH] Added scene name to config options

---
 .../RegionSyncServerModule.cs                 | 21 -------------------
 .../SymmetricSync/RegionSyncModule.cs         |  4 ++--
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs
index fc56777a0b..705a8aa9bd 100644
--- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs
+++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs
@@ -776,27 +776,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
                 m_log.Error("No RegionSyncClients connected");
         }
         #endregion
-
-
-        private static readonly Vector3 CenterOfRegion = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f),20);
-        // -----------------------------------------------------------------   
-        // -----------------------------------------------------------------   
-        internal void LocalChat(string msg, int channel)
-        {
-            OSChatMessage osm = new OSChatMessage();
-            osm.From = "RegionSyncServerModule";
-            osm.Message = msg;
-            osm.Type = ChatTypeEnum.Region;
-            osm.Position = CenterOfRegion;
-            osm.Sender = null;
-            osm.SenderUUID = OpenMetaverse.UUID.Zero; // Hmph! Still?
-
-            osm.Channel = channel;
-
-            m_log.DebugFormat("[REGION SYNC SERVER MODULE]  LocalChat({0},{1})", msg, channel);
-            m_scene.EventManager.TriggerOnChatBroadcast(this, osm);
-        }
-
     }
 
 }
diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
index b6718bab44..7b84505221 100755
--- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
+++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
@@ -525,8 +525,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
         {
             //For now, we assume there is only one remote listener to connect to. Later on, 
             //we may need to modify the code to read in multiple listeners.
-            string addr = m_sysConfig.GetString("SyncListenerIPAddress", IPAddrUnknown);
-            int port = m_sysConfig.GetInt("SyncListenerPort", PortUnknown);
+            string addr = m_sysConfig.GetString(m_scene.RegionInfo.RegionName + "_SyncListenerIPAddress", IPAddrUnknown);
+            int port = m_sysConfig.GetInt(m_scene.RegionInfo.RegionName + "_SyncListenerPort", PortUnknown);
             if (!addr.Equals(IPAddrUnknown) && port != PortUnknown)
             {
                 RegionSyncListenerInfo info = new RegionSyncListenerInfo(addr, port);