summaryrefslogtreecommitdiff
path: root/indra/newview/llsurface.cpp
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2010-10-28 13:54:43 -0400
committerprep <prep@lindenlab.com>2010-10-28 13:54:43 -0400
commita91bff4036bbdd0f32722ed573f9f44ab00f00f0 (patch)
treea2ee17189b530ace49c886d8a8acc4deb32620b5 /indra/newview/llsurface.cpp
parent53d5fd1e9bb59868b793f9bef0529cd62ca70126 (diff)
parent32bcdd11990e1fa5126a15a2bd22249162c0806a (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
{