OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "DEBUG DEBUG DEBUG" 

This reverts commit 59c2cd04ba.
viewer-2-initial-appearance
Diva Canto 2011-01-17 13:07:02 -08:00
parent 59c2cd04ba
commit 4bcee1dfb4
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -839,7 +839,6 @@ namespace OpenSim.Region.Framework.Scenes
m_rootRegionHandle = m_scene.RegionInfo.RegionHandle; m_rootRegionHandle = m_scene.RegionInfo.RegionHandle;
m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene); 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 // Moved this from SendInitialData to ensure that m_appearance is initialized
// before the inventory is processed in MakeRootAgent. This fixes a race condition // before the inventory is processed in MakeRootAgent. This fixes a race condition
@ -900,7 +899,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
AddToPhysicalScene(isFlying); AddToPhysicalScene(isFlying);
m_log.DebugFormat("[XXX] MakeRoot 2");
if (m_appearance != null) if (m_appearance != null)
{ {
@ -943,9 +941,7 @@ namespace OpenSim.Region.Framework.Scenes
presence.Animator.SendAnimPackToClient(ControllingClient); presence.Animator.SendAnimPackToClient(ControllingClient);
}); });
m_log.DebugFormat("[XXX] MakeRoot 3");
m_scene.EventManager.TriggerOnMakeRootAgent(this); m_scene.EventManager.TriggerOnMakeRootAgent(this);
m_log.DebugFormat("[XXX] MakeRoot 4");
} }
/// <summary> /// <summary>

2
OpenSim/Services/HypergridService/UserAgentService.cs
View File

@ -269,7 +269,7 @@ namespace OpenSim.Services.HypergridService
bool result = m_TravelingAgents[sessionID].ClientIPAddress == reportedIP || bool result = m_TravelingAgents[sessionID].ClientIPAddress == reportedIP ||
m_TravelingAgents[sessionID].MyIpAddress == reportedIP; // NATed m_TravelingAgents[sessionID].MyIpAddress == reportedIP; // NATed
m_log.DebugFormat("[USER AGENT SERVICE]: Comparing {0} with login IP {1} and MyIP {2}; result is {3}", m_log.DebugFormat("[USER AGENT SERVICE]: Comparing {0} with login IP {1} and MyIP {1}; result is {3}",
reportedIP, m_TravelingAgents[sessionID].ClientIPAddress, m_TravelingAgents[sessionID].MyIpAddress, result); reportedIP, m_TravelingAgents[sessionID].ClientIPAddress, m_TravelingAgents[sessionID].MyIpAddress, result);
return result; return result;