From b82b0b16770af89b0bbe48ba63a0d9fec9839d6d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 1 Mar 2011 09:20:50 -0800
Subject: Normalizing comparison to lower case, just in case ppl set their
 config vars inconsistently. (maybe related to mantis #5386)

---
 OpenSim/Services/HypergridService/UserAgentService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 3ead180..445d45e 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -253,7 +253,7 @@ namespace OpenSim.Services.HypergridService
 
             TravelingAgentInfo travel = m_TravelingAgents[sessionID];
 
-            return travel.GridExternalName == thisGridExternalName;
+            return travel.GridExternalName.ToLower() == thisGridExternalName.ToLower();
         }
 
         public bool VerifyClient(UUID sessionID, string reportedIP)
-- 
cgit v1.1


From 20aeace8d75fa5a1a3d0ba1d3d9ab6cdad2cf088 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 9 Mar 2011 22:03:12 +0000
Subject: Add log messages on teleport failure to better pin down the cause.

---
 .../Services/Connectors/Simulation/SimulationServiceConnector.cs   | 6 +++---
 OpenSim/Services/Interfaces/ISimulationService.cs                  | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 463b2fb..93b3ae6 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -79,9 +79,6 @@ namespace OpenSim.Services.Connectors.Simulation
             return "agent/";
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
         public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason)
         {
             // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CreateAgent start");
@@ -109,6 +106,9 @@ namespace OpenSim.Services.Connectors.Simulation
                 if (result["Success"].AsBoolean())
                     return true;
                 
+                m_log.WarnFormat(
+                    "[REMOTE SIMULATION CONNECTOR]: Failed to create agent {0} {1} at remote simulator {1}", 
+                    aCircuit.firstname, aCircuit.lastname, destination.RegionName);                       
                 reason = result["Message"] != null ? result["Message"].AsString() : "error";
                 return false;
             }
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs
index b796757..55c9cc5 100644
--- a/OpenSim/Services/Interfaces/ISimulationService.cs
+++ b/OpenSim/Services/Interfaces/ISimulationService.cs
@@ -40,6 +40,13 @@ namespace OpenSim.Services.Interfaces
 
         #region Agents
 
+        /// <summary>
+        /// Ask the simulator hosting the destination to create an agent on that region.
+        /// </summary>
+        /// <param name="destination"></param>
+        /// <param name="aCircuit"></param>
+        /// <param name="flags"></param>
+        /// <param name="reason">Reason message in the event of a failure.</param>        
         bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason);
 
         /// <summary>
-- 
cgit v1.1