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

Revert most of the regionName message stuff.

afrisby
Charles Krinke 2007-12-24 19:27:52 +00:00
parent edf6f9e573
commit f28f917c61
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Framework/SerializableRegionInfo.cs
View File

@ -50,7 +50,6 @@ 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;
@ -61,7 +60,6 @@ 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;
@ -71,7 +69,6 @@ namespace OpenSim.Framework
{ {
m_regionLocX = regionLocX; m_regionLocX = regionLocX;
m_regionLocY = regionLocY; m_regionLocY = regionLocY;
m_regionName = regionName;
m_externalHostName = externalUri; m_externalHostName = externalUri;
@ -135,15 +132,6 @@ 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
{ {

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

@ -961,12 +961,6 @@ namespace OpenSim.Region.Communications.OGS1
public bool TriggerRegionUp(SearializableRegionInfo regionData, ulong regionhandle) public bool TriggerRegionUp(SearializableRegionInfo regionData, ulong regionhandle)
{ {
//CFK: I need a little help here as I would like to display the regionName along with the X,Y location
//CFL: but when run, I get an exception that m_regionName is not found in SearializableRegionInfo even
//CFK: though I believe I defined it correctly. I suspect that the class RegionInfo is perhaps biting
//CFK: me and hope someone can add clarity to my thoughts.
//CFK: MainLog.Instance.Verbose("INTER", gdebugRegionName + "Incoming OGS1 RegionUpReport: " +
//CFK: regionData.regionName + " (" + regionData.RegionLocX + "," + regionData.RegionLocY + ")");
MainLog.Instance.Verbose("INTER", gdebugRegionName + "Incoming OGS1 RegionUpReport: " + "(" + regionData.RegionLocX + "," + regionData.RegionLocY + ")"); MainLog.Instance.Verbose("INTER", gdebugRegionName + "Incoming OGS1 RegionUpReport: " + "(" + regionData.RegionLocX + "," + regionData.RegionLocY + ")");