From f28f917c614589fd8a0e01fc90964303e90bf1ca Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Mon, 24 Dec 2007 19:27:52 +0000
Subject: Revert most of the regionName message stuff.

---
 OpenSim/Framework/SerializableRegionInfo.cs            | 12 ------------
 OpenSim/Region/Communications/OGS1/OGS1GridServices.cs |  6 ------
 2 files changed, 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
         {
             m_regionLocX = ConvertFrom.RegionLocX;
             m_regionLocY = ConvertFrom.RegionLocY;
-            m_regionName = ConvertFrom.RegionName;
             m_internalEndPoint = ConvertFrom.InternalEndPoint;
             m_externalHostName = ConvertFrom.ExternalHostName;
             m_remotingPort = ConvertFrom.RemotingPort;
@@ -61,7 +60,6 @@ namespace OpenSim.Framework
 
             m_regionLocX = regionLocX;
             m_regionLocY = regionLocY;
-            m_regionName = regionName;
 
             m_internalEndPoint = internalEndPoint;
             m_externalHostName = externalUri;
@@ -71,7 +69,6 @@ namespace OpenSim.Framework
         {
             m_regionLocX = regionLocX;
             m_regionLocY = regionLocY;
-            m_regionName = regionName;
 
             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;
         public string ExternalHostName
         {
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
 
         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 + ")");
 
-- 
cgit v1.1