* Updates RESTInterregionComms and LocalInterregionComms to the new region module interface. This fixes an issue where region references were being added but weren't being deleted,

causing those "unnotified circuit" messages.
* Also fixes tests accordingly

- Fixes Mantis #3452
- Fixes Mantis #3388
- Fixes Mantis #3871
- Related to Mantis #3493

2 files changed, 3 insertions, 5 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index f0c31d0..1836447 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -71,10 +71,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             scene2 = SceneSetupHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000, cm);
             scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000, cm);
 
-            IRegionModule interregionComms = new RESTInterregionComms();
-            interregionComms.Initialise(scene, new IniConfigSource());
-            interregionComms.Initialise(scene2, new IniConfigSource());
-            interregionComms.Initialise(scene3, new IniConfigSource());
+            ISharedRegionModule interregionComms = new RESTInterregionComms();
+            interregionComms.Initialise(new IniConfigSource());
             interregionComms.PostInitialise();
             SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms);
             SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index 1be2285..ed2d317 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             TestCommunicationsManager cm = new TestCommunicationsManager();
 
             // shared module
-            IRegionModule interregionComms = new RESTInterregionComms();
+            ISharedRegionModule interregionComms = new RESTInterregionComms();
             
             Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000, cm);
             SceneSetupHelpers.SetupSceneModules(sceneA, new IniConfigSource(), interregionComms);