From e5f7c8b6e83170cbc7e0d49d9efd3fc3600396d3 Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Tue, 24 Dec 2013 12:31:26 -0800 Subject: varregion: add lots of DEBUG level log messages. Especially for teleport. --- .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 3 ++- .../Framework/EntityTransfer/EntityTransferStateMachine.cs | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer') diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 893b3c6..2aa43bc 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs @@ -1998,8 +1998,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer // Given a world position (fractional meter coordinate), get the GridRegion info for // the region containing that point. + // Someday this should be a method on GridService. // Return 'null' if no such region exists. - private GridRegion GetRegionContainingWorldLocation(IGridService pGridService, UUID pScopeID, double px, double py) + public GridRegion GetRegionContainingWorldLocation(IGridService pGridService, UUID pScopeID, double px, double py) { m_log.DebugFormat("{0} GetRegionContainingWorldLocation: call, XY=<{1},{2}>", LogHeader, px, py); GridRegion ret = null; diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs index fc02916..6a04acf 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs @@ -77,6 +77,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer public class EntityTransferStateMachine { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + private static readonly string LogHeader = "[ENTITY TRANSFER STATE MACHINE]"; /// /// If true then on a teleport, the source region waits for a callback from the destination region. If @@ -100,6 +101,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer /// true if the agent was not already in transit, false if it was internal bool SetInTransit(UUID id) { + m_log.DebugFormat("{0} SetInTransit. agent={1}, newState=Preparing", LogHeader, id); lock (m_agentsInTransit) { if (!m_agentsInTransit.ContainsKey(id)) @@ -121,6 +123,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer /// Illegal transitions will throw an Exception internal bool UpdateInTransit(UUID id, AgentTransferState newState) { + m_log.DebugFormat("{0} UpdateInTransit. agent={1}, newState={2}", LogHeader, id, newState); + bool transitionOkay = false; // We don't want to throw an exception on cancel since this can come it at any time. @@ -193,6 +197,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer } else if (failIfNotOkay) { + m_log.DebugFormat("{0} UpdateInTransit. Throwing transition failure = {1}", LogHeader, failureMessage); throw new Exception(failureMessage); } // else -- cgit v1.1