From 18ffbf63420b3fdb3e6a4cf87425be2c9063795c Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 10 Jul 2009 19:18:05 +0000
Subject: * minor format changes and message additions

---
 .../Framework/Communications/Clients/GridClient.cs | 26 +++++++++++++++++-----
 .../Region/Communications/OGS1/OGS1GridServices.cs |  6 ++---
 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;
 using System.Collections;
 using System.Collections.Generic;
 using System.Net;
+using System.Reflection;
 
+using log4net;
 using OpenMetaverse;
 using Nwc.XmlRpc;
 
@@ -37,9 +39,14 @@ namespace OpenSim.Framework.Communications.Clients
 {
     public class GridClient
     {
-
-        public bool RegisterRegion(string gridServerURL, string sendKey, string receiveKey, RegionInfo regionInfo, out bool forcefulBanLines)
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
+        public bool RegisterRegion(
+            string gridServerURL, string sendKey, string receiveKey, RegionInfo regionInfo, out bool forcefulBanLines)
         {
+            m_log.InfoFormat(
+                "[GRID CLIENT]: Registering region {0} with grid at {1}", regionInfo.RegionName, gridServerURL);
+            
             forcefulBanLines = true;
 
             Hashtable GridParams = new Hashtable();
@@ -165,7 +172,9 @@ namespace OpenSim.Framework.Communications.Clients
             return true;
         }
 
-        public bool RequestNeighborInfo(string gridServerURL, string sendKey, string receiveKey, UUID regionUUID, out RegionInfo regionInfo, out string errorMsg)
+        public bool RequestNeighborInfo(
+            string gridServerURL, string sendKey, string receiveKey, UUID regionUUID,
+            out RegionInfo regionInfo, out string errorMsg)
         {
             // didn't find it so far, we have to go the long way
             regionInfo = null;
@@ -201,7 +210,9 @@ namespace OpenSim.Framework.Communications.Clients
             return true; 
         }
 
-        public bool RequestNeighborInfo(string gridServerURL, string sendKey, string receiveKey, ulong regionHandle, out RegionInfo regionInfo, out string errorMsg)
+        public bool RequestNeighborInfo(
+            string gridServerURL, string sendKey, string receiveKey, ulong regionHandle, 
+            out RegionInfo regionInfo, out string errorMsg)
         {
             // didn't find it so far, we have to go the long way
             regionInfo = null;
@@ -257,7 +268,9 @@ namespace OpenSim.Framework.Communications.Clients
             return true;
         }
 
-        public bool RequestClosestRegion(string gridServerURL, string sendKey, string receiveKey, string regionName, out RegionInfo regionInfo, out string errorMsg)
+        public bool RequestClosestRegion(
+             string gridServerURL, string sendKey, string receiveKey, string regionName, 
+             out RegionInfo regionInfo, out string errorMsg)
         {
             regionInfo = null;
             errorMsg = string.Empty;
@@ -299,7 +312,8 @@ namespace OpenSim.Framework.Communications.Clients
         /// <param name="maxX">Maximum X value</param>
         /// <param name="maxY">Maximum Y value</param>
         /// <returns>Hashtable of hashtables containing map data elements</returns>
-        public bool MapBlockQuery(string gridServerURL, int minX, int minY, int maxX, int maxY, out Hashtable respData, out string errorMsg)
+        public bool MapBlockQuery(
+            string gridServerURL, int minX, int minY, int maxX, int maxY, out Hashtable respData, out string errorMsg)
         {
             respData = new Hashtable();
             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
                 throw e;
             }
 
-            m_regionsOnInstance.Add(regionInfo);
-
             m_log.InfoFormat(
-                "[OGS1 GRID SERVICES]: Attempting to register region {0} with grid at {1}",
+                "[OGS1 GRID SERVICES]: Registering region {0} with grid at {1}",
                 regionInfo.RegionName, serversInfo.GridURL);
+            
+            m_regionsOnInstance.Add(regionInfo);
 
             Hashtable GridParams = new Hashtable();
             // Login / Authentication
-- 
cgit v1.1