From 59c2cd04ba056b85eb4873e472b95826a1cc13b5 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 17 Jan 2011 12:35:19 -0800
Subject: DEBUG DEBUG DEBUG

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs      | 4 ++++
 OpenSim/Services/HypergridService/UserAgentService.cs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 3a40196..8e4aaf1 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -839,6 +839,7 @@ namespace OpenSim.Region.Framework.Scenes
             m_rootRegionHandle = m_scene.RegionInfo.RegionHandle;
 
             m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene);
+            m_log.DebugFormat("[XXX] MakeRoot 1");
 
             // Moved this from SendInitialData to ensure that m_appearance is initialized
             // before the inventory is processed in MakeRootAgent. This fixes a race condition
@@ -899,6 +900,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
             
             AddToPhysicalScene(isFlying);
+            m_log.DebugFormat("[XXX] MakeRoot 2");
 
             if (m_appearance != null)
             {
@@ -941,7 +943,9 @@ namespace OpenSim.Region.Framework.Scenes
                     presence.Animator.SendAnimPackToClient(ControllingClient);
             });
 
+            m_log.DebugFormat("[XXX] MakeRoot 3");
             m_scene.EventManager.TriggerOnMakeRootAgent(this);
+            m_log.DebugFormat("[XXX] MakeRoot 4");
         }
 
         /// <summary>
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 3ead180..d5842fb 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -269,7 +269,7 @@ namespace OpenSim.Services.HypergridService
                 bool result = m_TravelingAgents[sessionID].ClientIPAddress == reportedIP ||
                     m_TravelingAgents[sessionID].MyIpAddress == reportedIP; // NATed
 
-                m_log.DebugFormat("[USER AGENT SERVICE]: Comparing {0} with login IP {1} and MyIP {1}; result is {3}",
+                m_log.DebugFormat("[USER AGENT SERVICE]: Comparing {0} with login IP {1} and MyIP {2}; result is {3}",
                                     reportedIP, m_TravelingAgents[sessionID].ClientIPAddress, m_TravelingAgents[sessionID].MyIpAddress, result);
 
                 return result;
-- 
cgit v1.1