From 6c6a965320951250e7cbcc8c9875cab4b603bc76 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Thu, 1 Sep 2016 16:15:51 +0100
Subject: remove some MegaRegions code from physics

---
 OpenSim/Region/PhysicsModules/BulletS/BSScene.cs | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'OpenSim/Region/PhysicsModules/BulletS')

diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs b/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs
index 9b677be..ee57f0c 100644
--- a/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs
@@ -954,25 +954,6 @@ namespace OpenSim.Region.PhysicsModule.BulletS
             // m_log.DebugFormat("{0}: DeleteTerrain()", LogHeader);
         }
 
-        // Although no one seems to check this, I do support combining.
-        public override bool SupportsCombining()
-        {
-            return TerrainManager.SupportsCombining();
-        }
-        // This call says I am a child to region zero in a mega-region. 'pScene' is that
-        //    of region zero, 'offset' is my offset from regions zero's origin, and
-        //    'extents' is the largest XY that is handled in my region.
-        public override void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents)
-        {
-            TerrainManager.Combine(pScene, offset, extents);
-        }
-
-        // Unhook all the combining that I know about.
-        public override void UnCombine(PhysicsScene pScene)
-        {
-            TerrainManager.UnCombine(pScene);
-        }
-
         #endregion // Terrain
 
         public override Dictionary<uint, float> GetTopColliders()
-- 
cgit v1.1