summaryrefslogtreecommitdiff
path: root/indra/newview/llsurface.cpp
diff options
context:
space:
mode:
authorAndrew Meadows <andrew@lindenlab.com>2010-11-16 07:01:11 -0800
committerAndrew Meadows <andrew@lindenlab.com>2010-11-16 07:01:11 -0800
commit807007649a32c5276f31c5f73d6fade7d059ce07 (patch)
tree5730fa254ab3938a2acd4329921a57a551018ad1 /indra/newview/llsurface.cpp
parent92a8d93b0d3084c1ccd4fb9cccc285bc14d01404 (diff)
parente8e1d7e629b9a4a65cde766ed81334140a749428 (diff)
merge
Diffstat (limited to 'indra/newview/llsurface.cpp')
-rw-r--r--indra/newview/llsurface.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llsurface.cpp b/indra/newview/llsurface.cpp
index af4d9fa7b9..6fc8153b77 100644
--- a/indra/newview/llsurface.cpp
+++ b/indra/newview/llsurface.cpp
@@ -1162,8 +1162,13 @@ void LLSurface::setWaterHeight(F32 height)
if (!mWaterObjp.isNull())
{
LLVector3 water_pos_region = mWaterObjp->getPositionRegion();
+ bool changed = water_pos_region.mV[VZ] != height;
water_pos_region.mV[VZ] = height;
mWaterObjp->setPositionRegion(water_pos_region);
+ if (changed)
+ {
+ LLWorld::getInstance()->updateWaterObjects();
+ }
}
else
{