diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2010-12-09 11:07:50 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2010-12-09 11:07:50 -0500 |
| commit | b9cf73c29b4b87a391c78415e4c09c31b4ac045c (patch) | |
| tree | d843f4e78bc6874001cb81fc993cc59d0a179a83 /indra/newview/llsurface.cpp | |
| parent | a59c43f1adff35107e59fdfc3016d4329324bbaf (diff) | |
| parent | d9b4570883652d647c05083c18fac1a088efd6e2 (diff) | |
merge from http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llsurface.cpp')
| -rw-r--r-- | indra/newview/llsurface.cpp | 5 |
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 { |