aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications/OGS1/OGS1GridServices.cs')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs42
1 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index f324886..432c3c2 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -111,7 +111,7 @@ namespace OpenSim.Region.Communications.OGS1
111 GridParams["remoting_port"] = NetworkServersInfo.RemotingListenerPort.ToString(); 111 GridParams["remoting_port"] = NetworkServersInfo.RemotingListenerPort.ToString();
112 GridParams["map-image-id"] = regionInfo.EstateSettings.terrainImageID.ToString(); 112 GridParams["map-image-id"] = regionInfo.EstateSettings.terrainImageID.ToString();
113 GridParams["originUUID"] = regionInfo.originRegionID.ToString(); 113 GridParams["originUUID"] = regionInfo.originRegionID.ToString();
114 GridParams["server_uri"] = regionInfo.ServerURI; 114 GridParams["server_uri"] = regionInfo.ServerURI;
115 115
116 // part of an initial brutish effort to provide accurate information (as per the xml region spec) 116 // part of an initial brutish effort to provide accurate information (as per the xml region spec)
117 // wrt the ownership of a given region 117 // wrt the ownership of a given region
@@ -190,7 +190,7 @@ namespace OpenSim.Region.Communications.OGS1
190 return false; 190 return false;
191 } 191 }
192 192
193 // What does DeregisterRegion() do? 193 // What does DeregisterRegion() do?
194 return m_localBackend.DeregisterRegion(regionInfo); 194 return m_localBackend.DeregisterRegion(regionInfo);
195 } 195 }
196 196
@@ -633,10 +633,10 @@ namespace OpenSim.Region.Communications.OGS1
633 m_log.Warn("[OGS1 GRID SERVICES]: remoting object not found"); 633 m_log.Warn("[OGS1 GRID SERVICES]: remoting object not found");
634 } 634 }
635 remObject = null; 635 remObject = null;
636 //m_log.Info("[INTER]: " + 636// m_log.Info("[INTER]: " +
637 //gdebugRegionName + 637// gdebugRegionName +
638 //": OGS1 tried to Update Child Agent data on outside region and got " + 638// ": OGS1 tried to Update Child Agent data on outside region and got " +
639 //retValue.ToString()); 639// retValue.ToString());
640 640
641 return retValue; 641 return retValue;
642 } 642 }
@@ -693,7 +693,7 @@ namespace OpenSim.Region.Communications.OGS1
693 NoteDeadRegion(regionHandle); 693 NoteDeadRegion(regionHandle);
694 694
695 m_log.WarnFormat("[OGS1 GRID SERVICES]: Unable to connect to adjacent region: {0} {1},{2}", 695 m_log.WarnFormat("[OGS1 GRID SERVICES]: Unable to connect to adjacent region: {0} {1},{2}",
696 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); 696 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
697 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); 697 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
698 698
699 return false; 699 return false;
@@ -1194,7 +1194,7 @@ namespace OpenSim.Region.Communications.OGS1
1194 { 1194 {
1195 NoteDeadRegion(regionHandle); 1195 NoteDeadRegion(regionHandle);
1196 m_log.Warn("[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region to tell it to close child agents: " + regInfo.RegionName + 1196 m_log.Warn("[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region to tell it to close child agents: " + regInfo.RegionName +
1197 " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); 1197 " " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
1198 //m_log.Debug(e.ToString()); 1198 //m_log.Debug(e.ToString());
1199 return false; 1199 return false;
1200 } 1200 }
@@ -1202,10 +1202,10 @@ namespace OpenSim.Region.Communications.OGS1
1202 { 1202 {
1203 NoteDeadRegion(regionHandle); 1203 NoteDeadRegion(regionHandle);
1204 m_log.Warn("[OGS1 GRID SERVICES]: Socket Error: Unable to connect to adjacent region using tcp://" + 1204 m_log.Warn("[OGS1 GRID SERVICES]: Socket Error: Unable to connect to adjacent region using tcp://" +
1205 regInfo.RemotingAddress + 1205 regInfo.RemotingAddress +
1206 ":" + regInfo.RemotingPort + 1206 ":" + regInfo.RemotingPort +
1207 "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + 1207 "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY +
1208 " - Is this neighbor up?"); 1208 " - Is this neighbor up?");
1209 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); 1209 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
1210 return false; 1210 return false;
1211 } 1211 }
@@ -1213,9 +1213,9 @@ namespace OpenSim.Region.Communications.OGS1
1213 { 1213 {
1214 NoteDeadRegion(regionHandle); 1214 NoteDeadRegion(regionHandle);
1215 m_log.Warn("[OGS1 GRID SERVICES]: Invalid Credentials: Unable to connect to adjacent region using tcp://" + 1215 m_log.Warn("[OGS1 GRID SERVICES]: Invalid Credentials: Unable to connect to adjacent region using tcp://" +
1216 regInfo.RemotingAddress + 1216 regInfo.RemotingAddress +
1217 ":" + regInfo.RemotingPort + 1217 ":" + regInfo.RemotingPort +
1218 "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); 1218 "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
1219 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); 1219 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
1220 return false; 1220 return false;
1221 } 1221 }
@@ -1223,9 +1223,9 @@ namespace OpenSim.Region.Communications.OGS1
1223 { 1223 {
1224 NoteDeadRegion(regionHandle); 1224 NoteDeadRegion(regionHandle);
1225 m_log.Warn("[OGS1 GRID SERVICES]: Authentication exception: Unable to connect to adjacent region using tcp://" + 1225 m_log.Warn("[OGS1 GRID SERVICES]: Authentication exception: Unable to connect to adjacent region using tcp://" +
1226 regInfo.RemotingAddress + 1226 regInfo.RemotingAddress +
1227 ":" + regInfo.RemotingPort + 1227 ":" + regInfo.RemotingPort +
1228 "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); 1228 "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
1229 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); 1229 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
1230 return false; 1230 return false;
1231 } 1231 }
@@ -1233,9 +1233,9 @@ namespace OpenSim.Region.Communications.OGS1
1233 { 1233 {
1234 NoteDeadRegion(regionHandle); 1234 NoteDeadRegion(regionHandle);
1235 m_log.Warn("[OGS1 GRID SERVICES]: WebException exception: Unable to connect to adjacent region using tcp://" + 1235 m_log.Warn("[OGS1 GRID SERVICES]: WebException exception: Unable to connect to adjacent region using tcp://" +
1236 regInfo.RemotingAddress + 1236 regInfo.RemotingAddress +
1237 ":" + regInfo.RemotingPort + 1237 ":" + regInfo.RemotingPort +
1238 "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); 1238 "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
1239 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); 1239 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
1240 return false; 1240 return false;
1241 } 1241 }