diff options
author | Robert Adams | 2013-12-24 12:31:26 -0800 |
---|---|---|
committer | Robert Adams | 2013-12-24 12:31:26 -0800 |
commit | e5f7c8b6e83170cbc7e0d49d9efd3fc3600396d3 (patch) | |
tree | 57ef97b754fb3de30c37929ed890ecb982496735 /OpenSim/Region | |
parent | varregion: remove unused Scene.HaveNeighbor routine. Its computation (diff) | |
download | opensim-SC_OLD-e5f7c8b6e83170cbc7e0d49d9efd3fc3600396d3.zip opensim-SC_OLD-e5f7c8b6e83170cbc7e0d49d9efd3fc3600396d3.tar.gz opensim-SC_OLD-e5f7c8b6e83170cbc7e0d49d9efd3fc3600396d3.tar.bz2 opensim-SC_OLD-e5f7c8b6e83170cbc7e0d49d9efd3fc3600396d3.tar.xz |
varregion: add lots of DEBUG level log messages. Especially for teleport.
Diffstat (limited to '')
6 files changed, 16 insertions, 10 deletions
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 | |||
1998 | 1998 | ||
1999 | // Given a world position (fractional meter coordinate), get the GridRegion info for | 1999 | // Given a world position (fractional meter coordinate), get the GridRegion info for |
2000 | // the region containing that point. | 2000 | // the region containing that point. |
2001 | // Someday this should be a method on GridService. | ||
2001 | // Return 'null' if no such region exists. | 2002 | // Return 'null' if no such region exists. |
2002 | private GridRegion GetRegionContainingWorldLocation(IGridService pGridService, UUID pScopeID, double px, double py) | 2003 | public GridRegion GetRegionContainingWorldLocation(IGridService pGridService, UUID pScopeID, double px, double py) |
2003 | { | 2004 | { |
2004 | m_log.DebugFormat("{0} GetRegionContainingWorldLocation: call, XY=<{1},{2}>", LogHeader, px, py); | 2005 | m_log.DebugFormat("{0} GetRegionContainingWorldLocation: call, XY=<{1},{2}>", LogHeader, px, py); |
2005 | GridRegion ret = null; | 2006 | 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 | |||
77 | public class EntityTransferStateMachine | 77 | public class EntityTransferStateMachine |
78 | { | 78 | { |
79 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 79 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
80 | private static readonly string LogHeader = "[ENTITY TRANSFER STATE MACHINE]"; | ||
80 | 81 | ||
81 | /// <summary> | 82 | /// <summary> |
82 | /// If true then on a teleport, the source region waits for a callback from the destination region. If | 83 | /// 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 | |||
100 | /// <returns>true if the agent was not already in transit, false if it was</returns> | 101 | /// <returns>true if the agent was not already in transit, false if it was</returns> |
101 | internal bool SetInTransit(UUID id) | 102 | internal bool SetInTransit(UUID id) |
102 | { | 103 | { |
104 | m_log.DebugFormat("{0} SetInTransit. agent={1}, newState=Preparing", LogHeader, id); | ||
103 | lock (m_agentsInTransit) | 105 | lock (m_agentsInTransit) |
104 | { | 106 | { |
105 | if (!m_agentsInTransit.ContainsKey(id)) | 107 | if (!m_agentsInTransit.ContainsKey(id)) |
@@ -121,6 +123,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
121 | /// <exception cref='Exception'>Illegal transitions will throw an Exception</exception> | 123 | /// <exception cref='Exception'>Illegal transitions will throw an Exception</exception> |
122 | internal bool UpdateInTransit(UUID id, AgentTransferState newState) | 124 | internal bool UpdateInTransit(UUID id, AgentTransferState newState) |
123 | { | 125 | { |
126 | m_log.DebugFormat("{0} UpdateInTransit. agent={1}, newState={2}", LogHeader, id, newState); | ||
127 | |||
124 | bool transitionOkay = false; | 128 | bool transitionOkay = false; |
125 | 129 | ||
126 | // We don't want to throw an exception on cancel since this can come it at any time. | 130 | // 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 | |||
193 | } | 197 | } |
194 | else if (failIfNotOkay) | 198 | else if (failIfNotOkay) |
195 | { | 199 | { |
200 | m_log.DebugFormat("{0} UpdateInTransit. Throwing transition failure = {1}", LogHeader, failureMessage); | ||
196 | throw new Exception(failureMessage); | 201 | throw new Exception(failureMessage); |
197 | } | 202 | } |
198 | // else | 203 | // else |
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs index 3fa3706..966916a 100644 --- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | |||
@@ -76,8 +76,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
76 | 76 | ||
77 | void Cross(SceneObjectGroup sog, Vector3 position, bool silent); | 77 | void Cross(SceneObjectGroup sog, Vector3 position, bool silent); |
78 | 78 | ||
79 | ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version); | 79 | ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version); |
80 | |||
81 | } | 80 | } |
82 | 81 | ||
83 | public interface IUserAgentVerificationModule | 82 | public interface IUserAgentVerificationModule |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 65536db..9ae8612 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -46,8 +46,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
46 | { | 46 | { |
47 | public partial class Scene | 47 | public partial class Scene |
48 | { | 48 | { |
49 | private static readonly ILog m_log | 49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
50 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 50 | private static readonly string LogHeader = "[SCENE INVENTORY]"; |
51 | 51 | ||
52 | /// <summary> | 52 | /// <summary> |
53 | /// Allows asynchronous derezzing of objects from the scene into a client's inventory. | 53 | /// Allows asynchronous derezzing of objects from the scene into a client's inventory. |
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index 4f04706..f95220d 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
@@ -42,7 +42,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
42 | { | 42 | { |
43 | public abstract class SceneBase : IScene | 43 | public abstract class SceneBase : IScene |
44 | { | 44 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | private static readonly string LogHeader = "[SCENE]"; | ||
46 | 47 | ||
47 | #region Events | 48 | #region Events |
48 | 49 | ||
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 0cd8b21..4efd9d5 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -76,6 +76,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
76 | public class ScenePresence : EntityBase, IScenePresence | 76 | public class ScenePresence : EntityBase, IScenePresence |
77 | { | 77 | { |
78 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 78 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
79 | private static readonly String LogHeader = "[SCENE PRESENCE]"; | ||
79 | 80 | ||
80 | // ~ScenePresence() | 81 | // ~ScenePresence() |
81 | // { | 82 | // { |
@@ -3438,12 +3439,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
3438 | 3439 | ||
3439 | if (!IsInTransit) | 3440 | if (!IsInTransit) |
3440 | { | 3441 | { |
3441 | m_log.DebugFormat( | ||
3442 | "[SCENE PRESENCE]: Testing border check for projected position {0} of {1} in {2}", | ||
3443 | pos2, Name, Scene.Name); | ||
3444 | |||
3445 | if (!m_scene.PositionIsInCurrentRegion(pos2)) | 3442 | if (!m_scene.PositionIsInCurrentRegion(pos2)) |
3446 | { | 3443 | { |
3444 | m_log.DebugFormat("{0} CheckForBorderCrossing: position outside region. {1} in {2} at pos {3}", | ||
3445 | LogHeader, Name, Scene.Name, pos2); | ||
3446 | |||
3447 | // Disconnect from the current region | 3447 | // Disconnect from the current region |
3448 | bool isFlying = Flying; | 3448 | bool isFlying = Flying; |
3449 | RemoveFromPhysicalScene(); | 3449 | RemoveFromPhysicalScene(); |