From ec8101a24ad8181c12525421024616fc509b60da Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Thu, 28 Jul 2016 00:34:16 +0100
Subject: remove references to RegionCombinerModule

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index fac5547..37352af 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2925,18 +2925,8 @@ namespace OpenSim.Region.Framework.Scenes
             if (xx < 0 || yy < 0)
                 return false;
 
-            IRegionCombinerModule regionCombinerModule = RequestModuleInterface<IRegionCombinerModule>();
-            if (regionCombinerModule == null)
-            {
-                // Regular region. Just check for region size
-                if (xx < RegionInfo.RegionSizeX && yy < RegionInfo.RegionSizeY )
-                    ret = true;
-            }
-            else
-            {
-                // We're in a mega-region so see if we are still in that larger region
-                ret = regionCombinerModule.PositionIsInMegaregion(this.RegionInfo.RegionID, xx, yy);
-            }
+            if (xx < RegionInfo.RegionSizeX && yy < RegionInfo.RegionSizeY )
+                ret = true;
             return ret;
         }
 
-- 
cgit v1.1