* 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

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
         private GetLandData handlerGetLandData = null; // OnGetLandData
 
         public KiPrimitiveDelegate KiPrimitive;
-        public string _debugRegionName = String.Empty;
-
-        public string debugRegionName
-        {
-            get { return _debugRegionName; }
-            set { _debugRegionName = value; }
-        }
 
         public SceneCommunicationService(CommunicationsManager commsMan)
         {
             m_commsProvider = commsMan;
-            m_commsProvider.GridService.gdebugRegionName = _debugRegionName;
-            m_commsProvider.InterRegion.rdebugRegionName = _debugRegionName;
         }
 
         /// <summary>
@@ -99,13 +90,15 @@ namespace OpenSim.Region.Environment.Scenes
         public void RegisterRegion(RegionInfo regionInfos)
         {
             m_regionInfo = regionInfos;
+            m_commsProvider.GridService.gdebugRegionName = regionInfos.RegionName;
+            m_commsProvider.InterRegion.rdebugRegionName = regionInfos.RegionName;            
             regionCommsHost = m_commsProvider.GridService.RegisterRegion(m_regionInfo);
 
             if (regionCommsHost != null)
             {
                 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: registered with gridservice and got" + regionCommsHost.ToString());
 
-                regionCommsHost.debugRegionName = _debugRegionName;
+                regionCommsHost.debugRegionName = regionInfos.RegionName;
                 regionCommsHost.OnExpectPrim += IncomingPrimCrossing;
                 regionCommsHost.OnExpectUser += NewUserConnection;
                 regionCommsHost.OnAvatarCrossingIntoRegion += AgentCrossing;