aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2016-08-09 22:29:11 +0100
committerUbitUmarov2016-08-09 22:29:11 +0100
commit8fb7a3543f8f15da65a43065020e9ef397b0faaa (patch)
tree575e2297097e4f2b5ad3a7eea742eb092609c507 /OpenSim/Region
parentadd a SimpleAngularDistance Updates prioritazition scheme. Results don't look... (diff)
downloadopensim-SC-8fb7a3543f8f15da65a43065020e9ef397b0faaa.zip
opensim-SC-8fb7a3543f8f15da65a43065020e9ef397b0faaa.tar.gz
opensim-SC-8fb7a3543f8f15da65a43065020e9ef397b0faaa.tar.bz2
opensim-SC-8fb7a3543f8f15da65a43065020e9ef397b0faaa.tar.xz
let physics know about region water level change
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 3ded00c..56d41a8 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -572,6 +572,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
572 bool UseEstateSun, bool UseFixedSun, float SunHour, 572 bool UseEstateSun, bool UseFixedSun, float SunHour,
573 bool UseGlobal, bool EstateFixedSun, float EstateSunHour) 573 bool UseGlobal, bool EstateFixedSun, float EstateSunHour)
574 { 574 {
575 double lastwaterlevel = Scene.RegionInfo.RegionSettings.WaterHeight;
575 // Water Height 576 // Water Height
576 Scene.RegionInfo.RegionSettings.WaterHeight = WaterHeight; 577 Scene.RegionInfo.RegionSettings.WaterHeight = WaterHeight;
577 578
@@ -584,6 +585,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
584 Scene.RegionInfo.RegionSettings.FixedSun = UseFixedSun; 585 Scene.RegionInfo.RegionSettings.FixedSun = UseFixedSun;
585 Scene.RegionInfo.RegionSettings.SunPosition = SunHour; 586 Scene.RegionInfo.RegionSettings.SunPosition = SunHour;
586 587
588 if(Scene.PhysicsEnabled && Scene.PhysicsScene != null && lastwaterlevel != WaterHeight)
589 Scene.PhysicsScene.SetWaterLevel(WaterHeight);
590
587 Scene.TriggerEstateSunUpdate(); 591 Scene.TriggerEstateSunUpdate();
588 592
589 //m_log.Debug("[ESTATE]: UFS: " + UseFixedSun.ToString()); 593 //m_log.Debug("[ESTATE]: UFS: " + UseFixedSun.ToString());
@@ -1471,7 +1475,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
1471 Scene.RegionInfo.EstateSettings.FixedSun, 1475 Scene.RegionInfo.EstateSettings.FixedSun,
1472 (float)Scene.RegionInfo.EstateSettings.SunPosition); 1476 (float)Scene.RegionInfo.EstateSettings.SunPosition);
1473 1477
1474 sendRegionInfoPacketToAll(); 1478// sendRegionInfoPacketToAll(); already done by setRegionTerrainSettings
1475 } 1479 }
1476 1480
1477 1481