aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-10-31 18:39:51 +0000
committerJustin Clarke Casey2008-10-31 18:39:51 +0000
commit269303d97d96b1deeabd610389ca2bdb17c2b7d9 (patch)
tree84d6902977d745e5e9e934fa830d4da06b6f8a10 /OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
parent* Enables PrimitiveBaseShape to be used inside a libOpenMV project by adding ... (diff)
downloadopensim-SC-269303d97d96b1deeabd610389ca2bdb17c2b7d9.zip
opensim-SC-269303d97d96b1deeabd610389ca2bdb17c2b7d9.tar.gz
opensim-SC-269303d97d96b1deeabd610389ca2bdb17c2b7d9.tar.bz2
opensim-SC-269303d97d96b1deeabd610389ca2bdb17c2b7d9.tar.xz
* test: Add basic scene test which merely instantiates the scene right now
* set debug scene name on scene registration, rather than within the Scene constructor
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs13
1 files changed, 3 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 447cd6f..b716980 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -76,19 +76,10 @@ namespace OpenSim.Region.Environment.Scenes
76 private GetLandData handlerGetLandData = null; // OnGetLandData 76 private GetLandData handlerGetLandData = null; // OnGetLandData
77 77
78 public KiPrimitiveDelegate KiPrimitive; 78 public KiPrimitiveDelegate KiPrimitive;
79 public string _debugRegionName = String.Empty;
80
81 public string debugRegionName
82 {
83 get { return _debugRegionName; }
84 set { _debugRegionName = value; }
85 }
86 79
87 public SceneCommunicationService(CommunicationsManager commsMan) 80 public SceneCommunicationService(CommunicationsManager commsMan)
88 { 81 {
89 m_commsProvider = commsMan; 82 m_commsProvider = commsMan;
90 m_commsProvider.GridService.gdebugRegionName = _debugRegionName;
91 m_commsProvider.InterRegion.rdebugRegionName = _debugRegionName;
92 } 83 }
93 84
94 /// <summary> 85 /// <summary>
@@ -99,13 +90,15 @@ namespace OpenSim.Region.Environment.Scenes
99 public void RegisterRegion(RegionInfo regionInfos) 90 public void RegisterRegion(RegionInfo regionInfos)
100 { 91 {
101 m_regionInfo = regionInfos; 92 m_regionInfo = regionInfos;
93 m_commsProvider.GridService.gdebugRegionName = regionInfos.RegionName;
94 m_commsProvider.InterRegion.rdebugRegionName = regionInfos.RegionName;
102 regionCommsHost = m_commsProvider.GridService.RegisterRegion(m_regionInfo); 95 regionCommsHost = m_commsProvider.GridService.RegisterRegion(m_regionInfo);
103 96
104 if (regionCommsHost != null) 97 if (regionCommsHost != null)
105 { 98 {
106 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: registered with gridservice and got" + regionCommsHost.ToString()); 99 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: registered with gridservice and got" + regionCommsHost.ToString());
107 100
108 regionCommsHost.debugRegionName = _debugRegionName; 101 regionCommsHost.debugRegionName = regionInfos.RegionName;
109 regionCommsHost.OnExpectPrim += IncomingPrimCrossing; 102 regionCommsHost.OnExpectPrim += IncomingPrimCrossing;
110 regionCommsHost.OnExpectUser += NewUserConnection; 103 regionCommsHost.OnExpectUser += NewUserConnection;
111 regionCommsHost.OnAvatarCrossingIntoRegion += AgentCrossing; 104 regionCommsHost.OnAvatarCrossingIntoRegion += AgentCrossing;