aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-12-16 21:16:01 +0000
committerJustin Clark-Casey (justincc)2011-12-16 21:16:01 +0000
commit5c4056660fe7678315716e52cfe57da0ba448efe (patch)
treeb3989066549da4acecb692c7e6e48e6e1f4c73a1 /OpenSim
parentComment out accidentally left in "Adding physics prim" log message (diff)
downloadopensim-SC_OLD-5c4056660fe7678315716e52cfe57da0ba448efe.zip
opensim-SC_OLD-5c4056660fe7678315716e52cfe57da0ba448efe.tar.gz
opensim-SC_OLD-5c4056660fe7678315716e52cfe57da0ba448efe.tar.bz2
opensim-SC_OLD-5c4056660fe7678315716e52cfe57da0ba448efe.tar.xz
Don't pass on ChaneWaterHeight event from EventManager is new water height is less than 0
This is to stop bad values and subsequent viewer crashes. Thanks to Michelle Argus for this patch.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 4a4d98f..4f71915 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -1564,6 +1564,12 @@ namespace OpenSim.Region.Framework.Scenes
1564 1564
1565 public void TriggerRequestChangeWaterHeight(float height) 1565 public void TriggerRequestChangeWaterHeight(float height)
1566 { 1566 {
1567 if (height < 0)
1568 {
1569 // ignore negative water height
1570 return;
1571 }
1572
1567 RequestChangeWaterHeight handlerRequestChangeWaterHeight = OnRequestChangeWaterHeight; 1573 RequestChangeWaterHeight handlerRequestChangeWaterHeight = OnRequestChangeWaterHeight;
1568 if (handlerRequestChangeWaterHeight != null) 1574 if (handlerRequestChangeWaterHeight != null)
1569 { 1575 {