aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorRobert Adams2014-05-31 12:10:50 -0700
committerRobert Adams2014-05-31 12:19:51 -0700
commit0300ec45ebc7b8696c64bf4575bf674a6b1a8fa7 (patch)
treeb76e90c764c068ab65fde1ead2016ba9edafcb58 /OpenSim/Region/Framework
parentvarregion: More tweeking to only sending patches within avatar draw distance. (diff)
downloadopensim-SC-0300ec45ebc7b8696c64bf4575bf674a6b1a8fa7.zip
opensim-SC-0300ec45ebc7b8696c64bf4575bf674a6b1a8fa7.tar.gz
opensim-SC-0300ec45ebc7b8696c64bf4575bf674a6b1a8fa7.tar.bz2
opensim-SC-0300ec45ebc7b8696c64bf4575bf674a6b1a8fa7.tar.xz
Modifications to debugging printouts. No functional changes.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs14
1 files changed, 5 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index c873e40..45c3348 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -52,6 +52,7 @@ namespace OpenSim.Region.Framework.Scenes
52 public class SceneCommunicationService //one instance per region 52 public class SceneCommunicationService //one instance per region
53 { 53 {
54 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 54 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
55 private static string LogHeader = "[SCENE COMMUNIATION SERVICE]";
55 56
56 protected RegionInfo m_regionInfo; 57 protected RegionInfo m_regionInfo;
57 protected Scene m_scene; 58 protected Scene m_scene;
@@ -84,15 +85,12 @@ namespace OpenSim.Region.Framework.Scenes
84 if (neighbourService != null) 85 if (neighbourService != null)
85 neighbour = neighbourService.HelloNeighbour(regionhandle, region); 86 neighbour = neighbourService.HelloNeighbour(regionhandle, region);
86 else 87 else
87 m_log.DebugFormat( 88 m_log.DebugFormat( "{0} neighbour service provided for region {0} to inform neigbhours of status", LogHeader, m_scene.Name);
88 "[SCENE COMMUNICATION SERVICE]: No neighbour service provided for region {0} to inform neigbhours of status",
89 m_scene.Name);
90 89
91 if (neighbour != null) 90 if (neighbour != null)
92 { 91 {
93 m_log.DebugFormat( 92 m_log.DebugFormat( "{0} Region {1} successfully informed neighbour {2} at {3}-{4} that it is up",
94 "[SCENE COMMUNICATION SERVICE]: Region {0} successfully informed neighbour {1} at {2}-{3} that it is up", 93 LogHeader, m_scene.Name, neighbour.RegionName, Util.WorldToRegionLoc(x), Util.WorldToRegionLoc(y));
95 m_scene.Name, neighbour.RegionName, Util.WorldToRegionLoc(x), Util.WorldToRegionLoc(y));
96 94
97 m_scene.EventManager.TriggerOnRegionUp(neighbour); 95 m_scene.EventManager.TriggerOnRegionUp(neighbour);
98 } 96 }
@@ -111,9 +109,7 @@ namespace OpenSim.Region.Framework.Scenes
111 List<GridRegion> neighbours 109 List<GridRegion> neighbours
112 = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID); 110 = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID);
113 111
114 m_log.DebugFormat( 112 m_log.DebugFormat("{0} Informing {1} neighbours that region {2} is up", LogHeader, neighbours.Count, m_scene.Name);
115 "[SCENE COMMUNICATION SERVICE]: Informing {0} neighbours that region {1} is up",
116 neighbours.Count, m_scene.Name);
117 113
118 foreach (GridRegion n in neighbours) 114 foreach (GridRegion n in neighbours)
119 { 115 {