aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2007-12-24 17:21:07 +0000
committerCharles Krinke2007-12-24 17:21:07 +0000
commit60b5130cffed0666b0eead441f50d1f965425acf (patch)
tree6ecaecab0a1719be165ac875d818669a7a10b66f
parent* ODE: now using the 10.00000638 density value on prim. (diff)
downloadopensim-SC_OLD-60b5130cffed0666b0eead441f50d1f965425acf.zip
opensim-SC_OLD-60b5130cffed0666b0eead441f50d1f965425acf.tar.gz
opensim-SC_OLD-60b5130cffed0666b0eead441f50d1f965425acf.tar.bz2
opensim-SC_OLD-60b5130cffed0666b0eead441f50d1f965425acf.tar.xz
Add regionName to OGS1 regionUp report.
-rw-r--r--OpenSim/Framework/SerializableRegionInfo.cs12
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs3
2 files changed, 14 insertions, 1 deletions
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
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;
53 m_internalEndPoint = ConvertFrom.InternalEndPoint; 54 m_internalEndPoint = ConvertFrom.InternalEndPoint;
54 m_externalHostName = ConvertFrom.ExternalHostName; 55 m_externalHostName = ConvertFrom.ExternalHostName;
55 m_remotingPort = ConvertFrom.RemotingPort; 56 m_remotingPort = ConvertFrom.RemotingPort;
@@ -60,6 +61,7 @@ namespace OpenSim.Framework
60 61
61 m_regionLocX = regionLocX; 62 m_regionLocX = regionLocX;
62 m_regionLocY = regionLocY; 63 m_regionLocY = regionLocY;
64 m_regionName = regionName;
63 65
64 m_internalEndPoint = internalEndPoint; 66 m_internalEndPoint = internalEndPoint;
65 m_externalHostName = externalUri; 67 m_externalHostName = externalUri;
@@ -69,6 +71,7 @@ namespace OpenSim.Framework
69 { 71 {
70 m_regionLocX = regionLocX; 72 m_regionLocX = regionLocX;
71 m_regionLocY = regionLocY; 73 m_regionLocY = regionLocY;
74 m_regionName = regionName;
72 75
73 m_externalHostName = externalUri; 76 m_externalHostName = externalUri;
74 77
@@ -132,6 +135,15 @@ namespace OpenSim.Framework
132 } 135 }
133 } 136 }
134 137
138 protected string m_regionName;
139 public string regionName
140 {
141 get
142 {
143 return m_regionName;
144 }
145 }
146
135 protected string m_externalHostName; 147 protected string m_externalHostName;
136 public string ExternalHostName 148 public string ExternalHostName
137 { 149 {
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
961 961
962 public bool TriggerRegionUp(SearializableRegionInfo regionData, ulong regionhandle) 962 public bool TriggerRegionUp(SearializableRegionInfo regionData, ulong regionhandle)
963 { 963 {
964 MainLog.Instance.Verbose("INTER", gdebugRegionName + ": Incoming OGS1 RegionUpReport: " + regionData.RegionLocX + "," + regionData.RegionLocY); 964 MainLog.Instance.Verbose("INTER", gdebugRegionName + "Incoming OGS1 RegionUpReport: " +
965 regionData.regionName + " (" + regionData.RegionLocX + "," + regionData.RegionLocY + ")" );
965 966
966 try 967 try
967 { 968 {