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

Add regionName to OGS1 regionUp report.

afrisby
Charles Krinke 2007-12-24 17:21:07 +00:00
parent de43f7e858
commit 60b5130cff
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Framework/SerializableRegionInfo.cs
View File

@ -50,6 +50,7 @@ namespace OpenSim.Framework
{ {
m_regionLocX = ConvertFrom.RegionLocX; m_regionLocX = ConvertFrom.RegionLocX;
m_regionLocY = ConvertFrom.RegionLocY; m_regionLocY = ConvertFrom.RegionLocY;
m_regionName = ConvertFrom.RegionName;
m_internalEndPoint = ConvertFrom.InternalEndPoint; m_internalEndPoint = ConvertFrom.InternalEndPoint;
m_externalHostName = ConvertFrom.ExternalHostName; m_externalHostName = ConvertFrom.ExternalHostName;
m_remotingPort = ConvertFrom.RemotingPort; m_remotingPort = ConvertFrom.RemotingPort;
@ -60,6 +61,7 @@ namespace OpenSim.Framework
m_regionLocX = regionLocX; m_regionLocX = regionLocX;
m_regionLocY = regionLocY; m_regionLocY = regionLocY;
m_regionName = regionName;
m_internalEndPoint = internalEndPoint; m_internalEndPoint = internalEndPoint;
m_externalHostName = externalUri; m_externalHostName = externalUri;
@ -69,6 +71,7 @@ namespace OpenSim.Framework
{ {
m_regionLocX = regionLocX; m_regionLocX = regionLocX;
m_regionLocY = regionLocY; m_regionLocY = regionLocY;
m_regionName = regionName;
m_externalHostName = externalUri; m_externalHostName = externalUri;
@ -132,6 +135,15 @@ namespace OpenSim.Framework
} }
} }
protected string m_regionName;
public string regionName
{
get
{
return m_regionName;
}
}
protected string m_externalHostName; protected string m_externalHostName;
public string ExternalHostName public string ExternalHostName
{ {

3
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -961,7 +961,8 @@ namespace OpenSim.Region.Communications.OGS1
public bool TriggerRegionUp(SearializableRegionInfo regionData, ulong regionhandle) public bool TriggerRegionUp(SearializableRegionInfo regionData, ulong regionhandle)
{ {
MainLog.Instance.Verbose("INTER", gdebugRegionName + ": Incoming OGS1 RegionUpReport: " + regionData.RegionLocX + "," + regionData.RegionLocY); MainLog.Instance.Verbose("INTER", gdebugRegionName + "Incoming OGS1 RegionUpReport: " +
regionData.regionName + " (" + regionData.RegionLocX + "," + regionData.RegionLocY + ")" );
try try
{ {