aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2011-01-17 12:35:19 -0800
committerDiva Canto2011-01-17 12:35:19 -0800
commit59c2cd04ba056b85eb4873e472b95826a1cc13b5 (patch)
tree7ce3f94608981376a6908d3fa7f97f9ec1108981
parentProtect World Map module, RequestMapItemsAsync, from badly formed URLs. (diff)
downloadopensim-SC_OLD-59c2cd04ba056b85eb4873e472b95826a1cc13b5.zip
opensim-SC_OLD-59c2cd04ba056b85eb4873e472b95826a1cc13b5.tar.gz
opensim-SC_OLD-59c2cd04ba056b85eb4873e472b95826a1cc13b5.tar.bz2
opensim-SC_OLD-59c2cd04ba056b85eb4873e472b95826a1cc13b5.tar.xz
DEBUG DEBUG DEBUG
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
-rw-r--r--OpenSim/Services/HypergridService/UserAgentService.cs2
2 files changed, 5 insertions, 1 deletions
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
839 m_rootRegionHandle = m_scene.RegionInfo.RegionHandle; 839 m_rootRegionHandle = m_scene.RegionInfo.RegionHandle;
840 840
841 m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene); 841 m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene);
842 m_log.DebugFormat("[XXX] MakeRoot 1");
842 843
843 // Moved this from SendInitialData to ensure that m_appearance is initialized 844 // Moved this from SendInitialData to ensure that m_appearance is initialized
844 // before the inventory is processed in MakeRootAgent. This fixes a race condition 845 // before the inventory is processed in MakeRootAgent. This fixes a race condition
@@ -899,6 +900,7 @@ namespace OpenSim.Region.Framework.Scenes
899 } 900 }
900 901
901 AddToPhysicalScene(isFlying); 902 AddToPhysicalScene(isFlying);
903 m_log.DebugFormat("[XXX] MakeRoot 2");
902 904
903 if (m_appearance != null) 905 if (m_appearance != null)
904 { 906 {
@@ -941,7 +943,9 @@ namespace OpenSim.Region.Framework.Scenes
941 presence.Animator.SendAnimPackToClient(ControllingClient); 943 presence.Animator.SendAnimPackToClient(ControllingClient);
942 }); 944 });
943 945
946 m_log.DebugFormat("[XXX] MakeRoot 3");
944 m_scene.EventManager.TriggerOnMakeRootAgent(this); 947 m_scene.EventManager.TriggerOnMakeRootAgent(this);
948 m_log.DebugFormat("[XXX] MakeRoot 4");
945 } 949 }
946 950
947 /// <summary> 951 /// <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
269 bool result = m_TravelingAgents[sessionID].ClientIPAddress == reportedIP || 269 bool result = m_TravelingAgents[sessionID].ClientIPAddress == reportedIP ||
270 m_TravelingAgents[sessionID].MyIpAddress == reportedIP; // NATed 270 m_TravelingAgents[sessionID].MyIpAddress == reportedIP; // NATed
271 271
272 m_log.DebugFormat("[USER AGENT SERVICE]: Comparing {0} with login IP {1} and MyIP {1}; result is {3}", 272 m_log.DebugFormat("[USER AGENT SERVICE]: Comparing {0} with login IP {1} and MyIP {2}; result is {3}",
273 reportedIP, m_TravelingAgents[sessionID].ClientIPAddress, m_TravelingAgents[sessionID].MyIpAddress, result); 273 reportedIP, m_TravelingAgents[sessionID].ClientIPAddress, m_TravelingAgents[sessionID].MyIpAddress, result);
274 274
275 return result; 275 return result;