aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2007-12-24 19:27:52 +0000
committerCharles Krinke2007-12-24 19:27:52 +0000
commitf28f917c614589fd8a0e01fc90964303e90bf1ca (patch)
tree89fe7f9643f0eaa4d868a77a446a840301abbefe
parentGo back to displaying the X,Y and not the regionName until (diff)
downloadopensim-SC_OLD-f28f917c614589fd8a0e01fc90964303e90bf1ca.zip
opensim-SC_OLD-f28f917c614589fd8a0e01fc90964303e90bf1ca.tar.gz
opensim-SC_OLD-f28f917c614589fd8a0e01fc90964303e90bf1ca.tar.bz2
opensim-SC_OLD-f28f917c614589fd8a0e01fc90964303e90bf1ca.tar.xz
Revert most of the regionName message stuff.
-rw-r--r--OpenSim/Framework/SerializableRegionInfo.cs12
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs6
2 files changed, 0 insertions, 18 deletions
diff --git a/OpenSim/Framework/SerializableRegionInfo.cs b/OpenSim/Framework/SerializableRegionInfo.cs
index 31fa1e4..5df22cd 100644
--- a/OpenSim/Framework/SerializableRegionInfo.cs
+++ b/OpenSim/Framework/SerializableRegionInfo.cs
@@ -50,7 +50,6 @@ namespace OpenSim.Framework
50 { 50 {
51 m_regionLocX = ConvertFrom.RegionLocX; 51 m_regionLocX = ConvertFrom.RegionLocX;
52 m_regionLocY = ConvertFrom.RegionLocY; 52 m_regionLocY = ConvertFrom.RegionLocY;
53 m_regionName = ConvertFrom.RegionName;
54 m_internalEndPoint = ConvertFrom.InternalEndPoint; 53 m_internalEndPoint = ConvertFrom.InternalEndPoint;
55 m_externalHostName = ConvertFrom.ExternalHostName; 54 m_externalHostName = ConvertFrom.ExternalHostName;
56 m_remotingPort = ConvertFrom.RemotingPort; 55 m_remotingPort = ConvertFrom.RemotingPort;
@@ -61,7 +60,6 @@ namespace OpenSim.Framework
61 60
62 m_regionLocX = regionLocX; 61 m_regionLocX = regionLocX;
63 m_regionLocY = regionLocY; 62 m_regionLocY = regionLocY;
64 m_regionName = regionName;
65 63
66 m_internalEndPoint = internalEndPoint; 64 m_internalEndPoint = internalEndPoint;
67 m_externalHostName = externalUri; 65 m_externalHostName = externalUri;
@@ -71,7 +69,6 @@ namespace OpenSim.Framework
71 { 69 {
72 m_regionLocX = regionLocX; 70 m_regionLocX = regionLocX;
73 m_regionLocY = regionLocY; 71 m_regionLocY = regionLocY;
74 m_regionName = regionName;
75 72
76 m_externalHostName = externalUri; 73 m_externalHostName = externalUri;
77 74
@@ -135,15 +132,6 @@ namespace OpenSim.Framework
135 } 132 }
136 } 133 }
137 134
138 protected string m_regionName;
139 public string regionName
140 {
141 get
142 {
143 return m_regionName;
144 }
145 }
146
147 protected string m_externalHostName; 135 protected string m_externalHostName;
148 public string ExternalHostName 136 public string ExternalHostName
149 { 137 {
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 26dbf0e..2754c4e 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -961,12 +961,6 @@ namespace OpenSim.Region.Communications.OGS1
961 961
962 public bool TriggerRegionUp(SearializableRegionInfo regionData, ulong regionhandle) 962 public bool TriggerRegionUp(SearializableRegionInfo regionData, ulong regionhandle)
963 { 963 {
964 //CFK: I need a little help here as I would like to display the regionName along with the X,Y location
965 //CFL: but when run, I get an exception that m_regionName is not found in SearializableRegionInfo even
966 //CFK: though I believe I defined it correctly. I suspect that the class RegionInfo is perhaps biting
967 //CFK: me and hope someone can add clarity to my thoughts.
968 //CFK: MainLog.Instance.Verbose("INTER", gdebugRegionName + "Incoming OGS1 RegionUpReport: " +
969 //CFK: regionData.regionName + " (" + regionData.RegionLocX + "," + regionData.RegionLocY + ")");
970 964
971 MainLog.Instance.Verbose("INTER", gdebugRegionName + "Incoming OGS1 RegionUpReport: " + "(" + regionData.RegionLocX + "," + regionData.RegionLocY + ")"); 965 MainLog.Instance.Verbose("INTER", gdebugRegionName + "Incoming OGS1 RegionUpReport: " + "(" + regionData.RegionLocX + "," + regionData.RegionLocY + ")");
972 966