Merge branch 'master' into careminster

This commit is contained in:
Melanie
2011-12-18 10:49:45 +00:00
25 changed files with 303 additions and 294 deletions

View File

@@ -1588,6 +1588,12 @@ namespace OpenSim.Region.Framework.Scenes
public void TriggerRequestChangeWaterHeight(float height)
{
if (height < 0)
{
// ignore negative water height
return;
}
RequestChangeWaterHeight handlerRequestChangeWaterHeight = OnRequestChangeWaterHeight;
if (handlerRequestChangeWaterHeight != null)
{