diff options
author | Diva Canto | 2011-01-17 13:07:02 -0800 |
---|---|---|
committer | Diva Canto | 2011-01-17 13:07:02 -0800 |
commit | 4bcee1dfb4337fca342fd29916d5da3b4c7db954 (patch) | |
tree | e03b844902b35974a3bba3ec2ce7e063adf1cd0c /OpenSim | |
parent | DEBUG DEBUG DEBUG (diff) | |
download | opensim-SC_OLD-4bcee1dfb4337fca342fd29916d5da3b4c7db954.zip opensim-SC_OLD-4bcee1dfb4337fca342fd29916d5da3b4c7db954.tar.gz opensim-SC_OLD-4bcee1dfb4337fca342fd29916d5da3b4c7db954.tar.bz2 opensim-SC_OLD-4bcee1dfb4337fca342fd29916d5da3b4c7db954.tar.xz |
Revert "DEBUG DEBUG DEBUG"
This reverts commit 59c2cd04ba056b85eb4873e472b95826a1cc13b5.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 | ||||
-rw-r--r-- | OpenSim/Services/HypergridService/UserAgentService.cs | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 8e4aaf1..3a40196 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -839,7 +839,6 @@ 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"); | ||
843 | 842 | ||
844 | // Moved this from SendInitialData to ensure that m_appearance is initialized | 843 | // Moved this from SendInitialData to ensure that m_appearance is initialized |
845 | // before the inventory is processed in MakeRootAgent. This fixes a race condition | 844 | // before the inventory is processed in MakeRootAgent. This fixes a race condition |
@@ -900,7 +899,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
900 | } | 899 | } |
901 | 900 | ||
902 | AddToPhysicalScene(isFlying); | 901 | AddToPhysicalScene(isFlying); |
903 | m_log.DebugFormat("[XXX] MakeRoot 2"); | ||
904 | 902 | ||
905 | if (m_appearance != null) | 903 | if (m_appearance != null) |
906 | { | 904 | { |
@@ -943,9 +941,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
943 | presence.Animator.SendAnimPackToClient(ControllingClient); | 941 | presence.Animator.SendAnimPackToClient(ControllingClient); |
944 | }); | 942 | }); |
945 | 943 | ||
946 | m_log.DebugFormat("[XXX] MakeRoot 3"); | ||
947 | m_scene.EventManager.TriggerOnMakeRootAgent(this); | 944 | m_scene.EventManager.TriggerOnMakeRootAgent(this); |
948 | m_log.DebugFormat("[XXX] MakeRoot 4"); | ||
949 | } | 945 | } |
950 | 946 | ||
951 | /// <summary> | 947 | /// <summary> |
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index d5842fb..3ead180 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 {2}; result is {3}", | 272 | m_log.DebugFormat("[USER AGENT SERVICE]: Comparing {0} with login IP {1} and MyIP {1}; 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; |