Merge branch 'dev' into physics

dsg
Robert Adams 2011-01-05 16:49:28 -08:00
commit 2152a5ab7b
1 changed files with 2 additions and 2 deletions

View File

@ -502,8 +502,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
//For now, we use configuration to access the information. Might be replaced by some Grid Service later on. //For now, we use configuration to access the information. Might be replaced by some Grid Service later on.
private RegionSyncListenerInfo GetLocalSyncListenerInfo() private RegionSyncListenerInfo GetLocalSyncListenerInfo()
{ {
string addr = m_sysConfig.GetString("SyncListenerIPAddress", IPAddrUnknown); string addr = m_sysConfig.GetString(m_scene.RegionInfo.RegionName+"_SyncListenerIPAddress", IPAddrUnknown);
int port = m_sysConfig.GetInt("SyncListenerPort", PortUnknown); int port = m_sysConfig.GetInt(m_scene.RegionInfo.RegionName+"_SyncListenerPort", PortUnknown);
m_log.Warn(LogHeader + ", listener addr: " + addr + ", port: " + port); m_log.Warn(LogHeader + ", listener addr: " + addr + ", port: " + port);