diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 14 |
1 files changed, 2 insertions, 12 deletions
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 | |||
2925 | if (xx < 0 || yy < 0) | 2925 | if (xx < 0 || yy < 0) |
2926 | return false; | 2926 | return false; |
2927 | 2927 | ||
2928 | IRegionCombinerModule regionCombinerModule = RequestModuleInterface<IRegionCombinerModule>(); | 2928 | if (xx < RegionInfo.RegionSizeX && yy < RegionInfo.RegionSizeY ) |
2929 | if (regionCombinerModule == null) | 2929 | ret = true; |
2930 | { | ||
2931 | // Regular region. Just check for region size | ||
2932 | if (xx < RegionInfo.RegionSizeX && yy < RegionInfo.RegionSizeY ) | ||
2933 | ret = true; | ||
2934 | } | ||
2935 | else | ||
2936 | { | ||
2937 | // We're in a mega-region so see if we are still in that larger region | ||
2938 | ret = regionCombinerModule.PositionIsInMegaregion(this.RegionInfo.RegionID, xx, yy); | ||
2939 | } | ||
2940 | return ret; | 2930 | return ret; |
2941 | } | 2931 | } |
2942 | 2932 | ||