diff options
author | Justin Clarke Casey | 2009-07-10 19:18:05 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-07-10 19:18:05 +0000 |
commit | 18ffbf63420b3fdb3e6a4cf87425be2c9063795c (patch) | |
tree | d1c121a19ba5f30e1f6d716541d6fd9e08754b61 /OpenSim/Framework | |
parent | * minor: standardize some logging messages (diff) | |
download | opensim-SC-18ffbf63420b3fdb3e6a4cf87425be2c9063795c.zip opensim-SC-18ffbf63420b3fdb3e6a4cf87425be2c9063795c.tar.gz opensim-SC-18ffbf63420b3fdb3e6a4cf87425be2c9063795c.tar.bz2 opensim-SC-18ffbf63420b3fdb3e6a4cf87425be2c9063795c.tar.xz |
* minor format changes and message additions
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/Clients/GridClient.cs | 26 |
1 files changed, 20 insertions, 6 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; | |||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Net; | 31 | using System.Net; |
32 | using System.Reflection; | ||
32 | 33 | ||
34 | using log4net; | ||
33 | using OpenMetaverse; | 35 | using OpenMetaverse; |
34 | using Nwc.XmlRpc; | 36 | using 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; |