aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/Clients/GridClient.cs26
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs6
2 files changed, 23 insertions, 9 deletions
diff --git a/OpenSim/Framework/Communications/Clients/GridClient.cs b/OpenSim/Framework/Communications/Clients/GridClient.cs
index 74b78de..4836556 100644
--- a/OpenSim/Framework/Communications/Clients/GridClient.cs
+++ b/OpenSim/Framework/Communications/Clients/GridClient.cs
@@ -29,7 +29,9 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Net; 31using System.Net;
32using System.Reflection;
32 33
34using log4net;
33using OpenMetaverse; 35using OpenMetaverse;
34using Nwc.XmlRpc; 36using Nwc.XmlRpc;
35 37
@@ -37,9 +39,14 @@ namespace OpenSim.Framework.Communications.Clients
37{ 39{
38 public class GridClient 40 public class GridClient
39 { 41 {
40 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 public bool RegisterRegion(string gridServerURL, string sendKey, string receiveKey, RegionInfo regionInfo, out bool forcefulBanLines) 43
44 public bool RegisterRegion(
45 string gridServerURL, string sendKey, string receiveKey, RegionInfo regionInfo, out bool forcefulBanLines)
42 { 46 {
47 m_log.InfoFormat(
48 "[GRID CLIENT]: Registering region {0} with grid at {1}", regionInfo.RegionName, gridServerURL);
49
43 forcefulBanLines = true; 50 forcefulBanLines = true;
44 51
45 Hashtable GridParams = new Hashtable(); 52 Hashtable GridParams = new Hashtable();
@@ -165,7 +172,9 @@ namespace OpenSim.Framework.Communications.Clients
165 return true; 172 return true;
166 } 173 }
167 174
168 public bool RequestNeighborInfo(string gridServerURL, string sendKey, string receiveKey, UUID regionUUID, out RegionInfo regionInfo, out string errorMsg) 175 public bool RequestNeighborInfo(
176 string gridServerURL, string sendKey, string receiveKey, UUID regionUUID,
177 out RegionInfo regionInfo, out string errorMsg)
169 { 178 {
170 // didn't find it so far, we have to go the long way 179 // didn't find it so far, we have to go the long way
171 regionInfo = null; 180 regionInfo = null;
@@ -201,7 +210,9 @@ namespace OpenSim.Framework.Communications.Clients
201 return true; 210 return true;
202 } 211 }
203 212
204 public bool RequestNeighborInfo(string gridServerURL, string sendKey, string receiveKey, ulong regionHandle, out RegionInfo regionInfo, out string errorMsg) 213 public bool RequestNeighborInfo(
214 string gridServerURL, string sendKey, string receiveKey, ulong regionHandle,
215 out RegionInfo regionInfo, out string errorMsg)
205 { 216 {
206 // didn't find it so far, we have to go the long way 217 // didn't find it so far, we have to go the long way
207 regionInfo = null; 218 regionInfo = null;
@@ -257,7 +268,9 @@ namespace OpenSim.Framework.Communications.Clients
257 return true; 268 return true;
258 } 269 }
259 270
260 public bool RequestClosestRegion(string gridServerURL, string sendKey, string receiveKey, string regionName, out RegionInfo regionInfo, out string errorMsg) 271 public bool RequestClosestRegion(
272 string gridServerURL, string sendKey, string receiveKey, string regionName,
273 out RegionInfo regionInfo, out string errorMsg)
261 { 274 {
262 regionInfo = null; 275 regionInfo = null;
263 errorMsg = string.Empty; 276 errorMsg = string.Empty;
@@ -299,7 +312,8 @@ namespace OpenSim.Framework.Communications.Clients
299 /// <param name="maxX">Maximum X value</param> 312 /// <param name="maxX">Maximum X value</param>
300 /// <param name="maxY">Maximum Y value</param> 313 /// <param name="maxY">Maximum Y value</param>
301 /// <returns>Hashtable of hashtables containing map data elements</returns> 314 /// <returns>Hashtable of hashtables containing map data elements</returns>
302 public bool MapBlockQuery(string gridServerURL, int minX, int minY, int maxX, int maxY, out Hashtable respData, out string errorMsg) 315 public bool MapBlockQuery(
316 string gridServerURL, int minX, int minY, int maxX, int maxY, out Hashtable respData, out string errorMsg)
303 { 317 {
304 respData = new Hashtable(); 318 respData = new Hashtable();
305 errorMsg = string.Empty; 319 errorMsg = string.Empty;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index b24df6f..aef1b94 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -103,11 +103,11 @@ namespace OpenSim.Region.Communications.OGS1
103 throw e; 103 throw e;
104 } 104 }
105 105
106 m_regionsOnInstance.Add(regionInfo);
107
108 m_log.InfoFormat( 106 m_log.InfoFormat(
109 "[OGS1 GRID SERVICES]: Attempting to register region {0} with grid at {1}", 107 "[OGS1 GRID SERVICES]: Registering region {0} with grid at {1}",
110 regionInfo.RegionName, serversInfo.GridURL); 108 regionInfo.RegionName, serversInfo.GridURL);
109
110 m_regionsOnInstance.Add(regionInfo);
111 111
112 Hashtable GridParams = new Hashtable(); 112 Hashtable GridParams = new Hashtable();
113 // Login / Authentication 113 // Login / Authentication