2 files changed, 9 insertions, 8 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 47792a2..3900e7b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -85,9 +85,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             {
                 string name = moduleConfig.GetString("GridServices", "");
                 if (name == Name)
-                {
-                    
-                    if(InitialiseService(source,null))
+                {                   
+                    if(InitialiseService(source, null))
                         m_log.Info("[LOCAL GRID SERVICE CONNECTOR]: Local grid connector enabled");
                 }
             }
@@ -151,7 +150,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             scene.RegisterModuleInterface<IGridService>(this);
 
             m_RegionInfoCache.CacheLocal(new GridRegion(scene.RegionInfo));
-            scene.EventManager.OnRegionUp += OnRegionUp;
+//            scene.EventManager.OnRegionUp += OnRegionUp;
         }
 
         public void RemoveRegion(Scene scene)
@@ -160,7 +159,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 return;
 
             m_RegionInfoCache.Remove(scene.RegionInfo.ScopeID, scene.RegionInfo.RegionID);
-            scene.EventManager.OnRegionUp -= OnRegionUp;
+ //           scene.EventManager.OnRegionUp -= OnRegionUp;
         }
 
         public void RegionLoaded(Scene scene)
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index bdf217c..f8485e0 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -156,6 +156,9 @@ namespace OpenSim.Tests.Common
             TestScene testScene = new TestScene(
                 regInfo, m_acm, SimDataService, m_estateDataService, configSource, null);
 
+            testScene.RegionInfo.EstateSettings = new EstateSettings();
+            testScene.RegionInfo.EstateSettings.EstateOwner = UUID.Random();
+
             INonSharedRegionModule godsModule = new GodsModule();
             godsModule.Initialise(new IniConfigSource());
             godsModule.AddRegion(testScene);
@@ -197,13 +200,12 @@ namespace OpenSim.Tests.Common
             m_presenceService.RegionLoaded(testScene);
             testScene.AddRegionModule(m_presenceService.Name, m_presenceService);
             
-            testScene.RegionInfo.EstateSettings.EstateOwner = UUID.Random();
+            
             testScene.SetModuleInterfaces();
 
             testScene.LandChannel = new TestLandChannel(testScene);
             testScene.LoadWorldMap();
-
-            testScene.RegionInfo.EstateSettings = new EstateSettings();
+            
             testScene.LoginsEnabled = true;
             testScene.RegisterRegionWithGrid();