From 60b5130cffed0666b0eead441f50d1f965425acf Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Mon, 24 Dec 2007 17:21:07 +0000
Subject: Add regionName to OGS1 regionUp report.

---
 OpenSim/Framework/SerializableRegionInfo.cs            | 12 ++++++++++++
 OpenSim/Region/Communications/OGS1/OGS1GridServices.cs |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/SerializableRegionInfo.cs b/OpenSim/Framework/SerializableRegionInfo.cs
index 5df22cd..31fa1e4 100644
--- a/OpenSim/Framework/SerializableRegionInfo.cs
+++ b/OpenSim/Framework/SerializableRegionInfo.cs
@@ -50,6 +50,7 @@ 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;
@@ -60,6 +61,7 @@ namespace OpenSim.Framework
 
             m_regionLocX = regionLocX;
             m_regionLocY = regionLocY;
+            m_regionName = regionName;
 
             m_internalEndPoint = internalEndPoint;
             m_externalHostName = externalUri;
@@ -69,6 +71,7 @@ namespace OpenSim.Framework
         {
             m_regionLocX = regionLocX;
             m_regionLocY = regionLocY;
+            m_regionName = regionName;
 
             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;
         public string ExternalHostName
         {
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 7adac58..c38de7b 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -961,7 +961,8 @@ namespace OpenSim.Region.Communications.OGS1
 
         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
             {
-- 
cgit v1.1