OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changes names in Regions.ini, and added one more config item: SyncQuarkLocation.

dsg
Huaiyu (Kitty) Liu 2011-01-20 12:05:10 -08:00
parent a0eddfcf61
commit 43edf89a34
3 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
OpenSim/Framework/RegionInfo.cs
View File

@ -391,8 +391,10 @@ namespace OpenSim.Framework
private string m_syncListenerAddr = String.Empty; private string m_syncListenerAddr = String.Empty;
private int m_syncListenerPort; private int m_syncListenerPort;
//IP:port for the avatar sync server this actor is configured to connect to //IP:port for the avatar sync server this actor is configured to connect to
private string m_serverAddr = String.Empty; private string m_avatarSyncServerAddr = String.Empty;
private int m_serverPort; private int m_avatarSyncServerPort;
private uint m_quarkLocX;
private uint m_quarkLocY;
//end of SYMMETRIC SYNC //end of SYMMETRIC SYNC
// Apparently, we're applying the same estatesettings regardless of whether it's local or remote. // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
@ -693,13 +695,25 @@ namespace OpenSim.Framework
{ {
get { return m_syncListenerPort; } get { return m_syncListenerPort; }
} }
public string ServerIPAddress public string AvatarSyncServerAddress
{ {
get { return m_serverAddr; } get { return m_avatarSyncServerAddr; }
} }
public int ServerPort public int AvatarSyncServerPort
{ {
get { return m_serverPort; } get { return m_avatarSyncServerPort; }
}
public uint SyncQuarkLocationX
{
get { return m_quarkLocX; }
set { m_quarkLocX = value; }
}
public uint SyncQuarkLocationY
{
get { return m_quarkLocY; }
set { m_quarkLocY = value; }
} }
//end of SYMMETRIC SYNC //end of SYMMETRIC SYNC
@ -859,16 +873,24 @@ namespace OpenSim.Framework
ScopeID = new UUID(config.GetString("ScopeID", UUID.Zero.ToString())); ScopeID = new UUID(config.GetString("ScopeID", UUID.Zero.ToString()));
// SYMMETRIC SYNC // SYMMETRIC SYNC
m_syncListenerAddr = config.GetString("SyncListenerIPAddress", String.Empty); m_syncListenerAddr = config.GetString("SyncListenerAddress", String.Empty);
m_syncListenerPort = config.GetInt("SyncListenerPort", -1); m_syncListenerPort = config.GetInt("SyncListenerPort", -1);
//if either IP or port is not configured, we set IP to empty to raise warning later //if either IP or port is not configured, we set IP to empty to raise warning later
if (m_syncListenerPort == -1) if (m_syncListenerPort == -1)
m_syncListenerAddr = String.Empty; m_syncListenerAddr = String.Empty;
m_serverAddr = config.GetString("ServerIPAddress", String.Empty); m_avatarSyncServerAddr = config.GetString("AvatarSyncServerAddress", String.Empty);
m_serverPort = config.GetInt("ServerPort", -1); m_avatarSyncServerPort = config.GetInt("AvatarSyncServerPort", -1);
if (m_serverPort == -1) if (m_avatarSyncServerPort == -1)
m_serverAddr = String.Empty; m_avatarSyncServerAddr = String.Empty;
string quarkLocation = config.GetString("SyncQuarkLocation", String.Empty);
string[] quarkLocElements = location.Split(new char[] { ',' });
m_quarkLocX = Convert.ToUInt32(quarkLocElements[0]);
m_quarkLocY = Convert.ToUInt32(quarkLocElements[1]);
// end of SYMMETRIC SYNC // end of SYMMETRIC SYNC

4
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClientModule.cs
View File

@ -232,8 +232,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
private void Start() private void Start()
{ {
m_serveraddr = m_scene.RegionInfo.ServerIPAddress; m_serveraddr = m_scene.RegionInfo.AvatarSyncServerAddress;
m_serverport = m_scene.RegionInfo.ServerPort; m_serverport = m_scene.RegionInfo.AvatarSyncServerPort;
if (m_serveraddr.Equals(String.Empty) || m_serverport == -1) if (m_serveraddr.Equals(String.Empty) || m_serverport == -1)
{ {

4
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs
View File

@ -166,8 +166,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
} }
//end of SYMMETRIC SYNC //end of SYMMETRIC SYNC
// Start the server and listen for RegionSyncClients // Start the server and listen for RegionSyncClients
m_serveraddr = m_scene.RegionInfo.ServerIPAddress; m_serveraddr = m_scene.RegionInfo.AvatarSyncServerAddress;
m_serverport = m_scene.RegionInfo.ServerPort; m_serverport = m_scene.RegionInfo.AvatarSyncServerPort;
m_log.Debug("[REGION SYNC SERVER MODULE] to start server on " + m_serveraddr + ":" + m_serverport); m_log.Debug("[REGION SYNC SERVER MODULE] to start server on " + m_serveraddr + ":" + m_serverport);