From 5ddb8b535e33ea6fbe668bad76c25f501f154bae Mon Sep 17 00:00:00 2001
From: Jonathan Freedman
Date: Sat, 23 Oct 2010 00:18:19 -0400
Subject: * a bit of additional debugging:

---
 OpenSim/Services/HypergridService/UserAgentService.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Services/HypergridService')

diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index eb19fe2..32b4249 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -135,8 +135,6 @@ namespace OpenSim.Services.HypergridService
         {
             m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}", 
                 agentCircuit.firstname, agentCircuit.lastname, ((clientIP == null) ? "stored IP" : clientIP.Address.ToString()), gatekeeper.ServerURI);
-
-            m_log.Debug("LATG final server uri -> " + finalDestination.ServerURI );
             // Take the IP address + port of the gatekeeper (reg) plus the info of finalDestination
             GridRegion region = new GridRegion(gatekeeper);
             region.ServerURI = gatekeeper.ServerURI;
@@ -150,12 +148,13 @@ namespace OpenSim.Services.HypergridService
             // Generate a new service session
             agentCircuit.ServiceSessionID = region.ServerURI + ";" + UUID.Random();
             TravelingAgentInfo old = UpdateTravelInfo(agentCircuit, region);
-
-            m_log.Debug("region ServerURI -> " + region.ServerURI);
             
             bool success = false;
             string myExternalIP = string.Empty;
             string gridName = gatekeeper.ServerURI;
+            
+            m_log.Debug("m_grid - " + m_GridName + ", gn - " + gridName);
+            
             if (m_GridName == gridName)
                 success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason);
             else
-- 
cgit v1.1


From 72748746d53df1c033207452a4315d93bc780158 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 5 Dec 2010 19:43:24 -0800
Subject: Fixed some inconsistency with trailing /. Made debug messages
 consistent. Changed the stored region names of HG regions. Increased the size
 of regionName in DB.

---
 OpenSim/Services/HypergridService/GatekeeperService.cs | 4 +++-
 OpenSim/Services/HypergridService/UserAgentService.cs  | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Services/HypergridService')

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 10e3aee..05be7b8 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -87,6 +87,8 @@ namespace OpenSim.Services.HypergridService
                 //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!");
                 m_AllowTeleportsToAnyRegion = serverConfig.GetBoolean("AllowTeleportsToAnyRegion", true);
                 m_ExternalName = serverConfig.GetString("ExternalName", string.Empty);
+                if (m_ExternalName != string.Empty && !m_ExternalName.EndsWith("/"))
+                    m_ExternalName = m_ExternalName + "/";
 
                 Object[] args = new Object[] { config };
                 m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
@@ -118,7 +120,7 @@ namespace OpenSim.Services.HypergridService
         {
             regionID = UUID.Zero;
             regionHandle = 0;
-            externalName = m_ExternalName;
+            externalName = m_ExternalName + ((regionName != string.Empty) ? " " + regionName : "");
             imageURL = string.Empty;
             reason = string.Empty;
 
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 32b4249..3519250 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -101,6 +101,8 @@ namespace OpenSim.Services.HypergridService
                     serverConfig = config.Configs["GatekeeperService"];
                     m_GridName = serverConfig.GetString("ExternalName", string.Empty);
                 }
+                else if (!m_GridName.EndsWith("/"))
+                    m_GridName = m_GridName + "/";
             }
         }
 
@@ -152,8 +154,8 @@ namespace OpenSim.Services.HypergridService
             bool success = false;
             string myExternalIP = string.Empty;
             string gridName = gatekeeper.ServerURI;
-            
-            m_log.Debug("m_grid - " + m_GridName + ", gn - " + gridName);
+
+            m_log.DebugFormat("[USER AGENT SERVICE]: m_grid - {0}, gn - {1}", m_GridName, gridName);
             
             if (m_GridName == gridName)
                 success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason);
-- 
cgit v1.1