diff options
author | UbitUmarov | 2016-07-28 00:34:16 +0100 |
---|---|---|
committer | UbitUmarov | 2016-07-28 00:34:16 +0100 |
commit | ec8101a24ad8181c12525421024616fc509b60da (patch) | |
tree | 04d12c9203ce76a00a17efa34447d8a5bf821340 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | remove the RegionCombinerModule (mega regions), references still all over the... (diff) | |
download | opensim-SC_OLD-ec8101a24ad8181c12525421024616fc509b60da.zip opensim-SC_OLD-ec8101a24ad8181c12525421024616fc509b60da.tar.gz opensim-SC_OLD-ec8101a24ad8181c12525421024616fc509b60da.tar.bz2 opensim-SC_OLD-ec8101a24ad8181c12525421024616fc509b60da.tar.xz |
remove references to RegionCombinerModule
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 3167282..7c1a7631 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2910,11 +2910,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2910 | 2910 | ||
2911 | // Allow move to another sub-region within a megaregion | 2911 | // Allow move to another sub-region within a megaregion |
2912 | Vector2 regionSize; | 2912 | Vector2 regionSize; |
2913 | IRegionCombinerModule regionCombinerModule = m_scene.RequestModuleInterface<IRegionCombinerModule>(); | 2913 | regionSize = new Vector2(m_scene.RegionInfo.RegionSizeX, m_scene.RegionInfo.RegionSizeY); |
2914 | if (regionCombinerModule != null) | ||
2915 | regionSize = regionCombinerModule.GetSizeOfMegaregion(m_scene.RegionInfo.RegionID); | ||
2916 | else | ||
2917 | regionSize = new Vector2(m_scene.RegionInfo.RegionSizeX, m_scene.RegionInfo.RegionSizeY); | ||
2918 | 2914 | ||
2919 | if (pos.X < 0 || pos.X >= regionSize.X | 2915 | if (pos.X < 0 || pos.X >= regionSize.X |
2920 | || pos.Y < 0 || pos.Y >= regionSize.Y | 2916 | || pos.Y < 0 || pos.Y >= regionSize.Y |
@@ -2923,21 +2919,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2923 | 2919 | ||
2924 | float terrainHeight; | 2920 | float terrainHeight; |
2925 | Scene targetScene = m_scene; | 2921 | Scene targetScene = m_scene; |
2926 | // Get terrain height for sub-region in a megaregion if necessary | 2922 | terrainHeight = m_scene.GetGroundHeight(pos.X, pos.Y); |
2927 | if (regionCombinerModule != null) | ||
2928 | { | ||
2929 | int X = (int)((m_scene.RegionInfo.WorldLocX) + pos.X); | ||
2930 | int Y = (int)((m_scene.RegionInfo.WorldLocY) + pos.Y); | ||
2931 | GridRegion target_region = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, X, Y); | ||
2932 | // If X and Y is NaN, target_region will be null | ||
2933 | if (target_region == null) | ||
2934 | return; | ||
2935 | UUID target_regionID = target_region.RegionID; | ||
2936 | SceneManager.Instance.TryGetScene(target_region.RegionID, out targetScene); | ||
2937 | terrainHeight = (float)targetScene.Heightmap[(int)(pos.X % regionSize.X), (int)(pos.Y % regionSize.Y)]; | ||
2938 | } | ||
2939 | else | ||
2940 | terrainHeight = m_scene.GetGroundHeight(pos.X, pos.Y); | ||
2941 | 2923 | ||
2942 | // dont try to land underground | 2924 | // dont try to land underground |
2943 | terrainHeight += Appearance.AvatarHeight * 0.5f + 0.2f; | 2925 | terrainHeight += Appearance.AvatarHeight * 0.5f + 0.2f; |