aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorRobert Adams2013-12-24 12:31:26 -0800
committerRobert Adams2013-12-24 12:31:26 -0800
commite5f7c8b6e83170cbc7e0d49d9efd3fc3600396d3 (patch)
tree57ef97b754fb3de30c37929ed890ecb982496735 /OpenSim/Region/Framework/Scenes
parentvarregion: remove unused Scene.HaveNeighbor routine. Its computation (diff)
downloadopensim-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 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs8
3 files changed, 8 insertions, 7 deletions
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();