Merge branch 'grid-service-redux'

1 files changed, 2 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs
index f6737a5..5c9e66f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs
@@ -29,6 +29,7 @@ using System;
 using NUnit.Framework;
 using OpenMetaverse;
 using OpenSim.Framework;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
@@ -65,7 +66,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 throw new NotImplementedException();
             }
 
-            public override bool OtherRegionUp(RegionInfo thisRegion)
+            public override void OtherRegionUp(GridRegion otherRegion)
             {
                 throw new NotImplementedException();
             }