diff options
author | UbitUmarov | 2016-09-01 16:15:51 +0100 |
---|---|---|
committer | UbitUmarov | 2016-09-01 16:15:51 +0100 |
commit | 6c6a965320951250e7cbcc8c9875cab4b603bc76 (patch) | |
tree | d0f89e9ad2bc6193850a65d2f287229a54b9e74c /OpenSim/Region/PhysicsModules/BulletS | |
parent | change asset upload retry timer AutoReset back to true (diff) | |
download | opensim-SC-6c6a965320951250e7cbcc8c9875cab4b603bc76.zip opensim-SC-6c6a965320951250e7cbcc8c9875cab4b603bc76.tar.gz opensim-SC-6c6a965320951250e7cbcc8c9875cab4b603bc76.tar.bz2 opensim-SC-6c6a965320951250e7cbcc8c9875cab4b603bc76.tar.xz |
remove some MegaRegions code from physics
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS')
-rw-r--r-- | OpenSim/Region/PhysicsModules/BulletS/BSScene.cs | 19 |
1 files changed, 0 insertions, 19 deletions
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 | |||
954 | // m_log.DebugFormat("{0}: DeleteTerrain()", LogHeader); | 954 | // m_log.DebugFormat("{0}: DeleteTerrain()", LogHeader); |
955 | } | 955 | } |
956 | 956 | ||
957 | // Although no one seems to check this, I do support combining. | ||
958 | public override bool SupportsCombining() | ||
959 | { | ||
960 | return TerrainManager.SupportsCombining(); | ||
961 | } | ||
962 | // This call says I am a child to region zero in a mega-region. 'pScene' is that | ||
963 | // of region zero, 'offset' is my offset from regions zero's origin, and | ||
964 | // 'extents' is the largest XY that is handled in my region. | ||
965 | public override void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents) | ||
966 | { | ||
967 | TerrainManager.Combine(pScene, offset, extents); | ||
968 | } | ||
969 | |||
970 | // Unhook all the combining that I know about. | ||
971 | public override void UnCombine(PhysicsScene pScene) | ||
972 | { | ||
973 | TerrainManager.UnCombine(pScene); | ||
974 | } | ||
975 | |||
976 | #endregion // Terrain | 957 | #endregion // Terrain |
977 | 958 | ||
978 | public override Dictionary<uint, float> GetTopColliders() | 959 | public override Dictionary<uint, float> GetTopColliders() |