aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1
diff options
context:
space:
mode:
authorJeff Ames2008-08-28 14:41:54 +0000
committerJeff Ames2008-08-28 14:41:54 +0000
commit3bf88587277b83c0b6f058fabba7d46a3b5a6a00 (patch)
treeed4ad9dc27e649a6f52661665fb681984251f480 /OpenSim/Region/Communications/OGS1
parentThannk you, Ralphos, for a patch the corrects an improper cast in (diff)
downloadopensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.zip
opensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.tar.gz
opensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.tar.bz2
opensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.tar.xz
Update svn properties, formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Communications/OGS1')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index abaf743..da2e4a2 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -260,9 +260,9 @@ namespace OpenSim.Region.Communications.OGS1
260 catch (SocketException e) 260 catch (SocketException e)
261 { 261 {
262 m_log.WarnFormat( 262 m_log.WarnFormat(
263 "[OGS1 GRID SERVICES]: RequestNeighbours(): Lookup of neighbour {0} failed! Not including in neighbours list. {1}", 263 "[OGS1 GRID SERVICES]: RequestNeighbours(): Lookup of neighbour {0} failed! Not including in neighbours list. {1}",
264 simIp, e); 264 simIp, e);
265 265
266 continue; 266 continue;
267 } 267 }
268 268
@@ -304,7 +304,7 @@ namespace OpenSim.Region.Communications.OGS1
304 SendParams.Add(requestData); 304 SendParams.Add(requestData);
305 XmlRpcRequest gridReq = new XmlRpcRequest("simulator_data_request", SendParams); 305 XmlRpcRequest gridReq = new XmlRpcRequest("simulator_data_request", SendParams);
306 XmlRpcResponse gridResp = null; 306 XmlRpcResponse gridResp = null;
307 307
308 try 308 try
309 { 309 {
310 gridResp = gridReq.Send(serversInfo.GridURL, 3000); 310 gridResp = gridReq.Send(serversInfo.GridURL, 3000);
@@ -312,9 +312,9 @@ namespace OpenSim.Region.Communications.OGS1
312 catch (WebException e) 312 catch (WebException e)
313 { 313 {
314 m_log.ErrorFormat( 314 m_log.ErrorFormat(
315 "[OGS1 GRID SERVICES]: Communication with the grid server at {0} failed, {1}", 315 "[OGS1 GRID SERVICES]: Communication with the grid server at {0} failed, {1}",
316 serversInfo.GridURL, e); 316 serversInfo.GridURL, e);
317 317
318 return null; 318 return null;
319 } 319 }
320 320
@@ -1621,14 +1621,14 @@ namespace OpenSim.Region.Communications.OGS1
1621 { 1621 {
1622 m_log.DebugFormat( 1622 m_log.DebugFormat(
1623 "[OGS1 GRID SERVICES]: CheckRegion Socket Setup exception: {0}:{1}", e.Message, e.StackTrace); 1623 "[OGS1 GRID SERVICES]: CheckRegion Socket Setup exception: {0}:{1}", e.Message, e.StackTrace);
1624 1624
1625 return false; 1625 return false;
1626 } 1626 }
1627 1627
1628 if (timed_out) 1628 if (timed_out)
1629 { 1629 {
1630 m_log.DebugFormat( 1630 m_log.DebugFormat(
1631 "[OGS1 GRID SERVICES]: socket [{0}] timed out ({1}) waiting to obtain a connection.", 1631 "[OGS1 GRID SERVICES]: socket [{0}] timed out ({1}) waiting to obtain a connection.",
1632 m_EndPoint, timeOut * 1000); 1632 m_EndPoint, timeOut * 1000);
1633 1633
1634 if (retry) 1634 if (retry)