diff options
| author | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-10-27 09:04:27 -0400 |
|---|---|---|
| committer | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-10-27 09:04:27 -0400 |
| commit | ce34ba1b89a105e5f2f4902b2aebb486d16711e9 (patch) | |
| tree | 373b68976de2a260506615c6a1aa5380ffe15b22 /indra/newview/llsurface.cpp | |
| parent | 8bef9cc8137dc58b818c60dd1173959fcab40bd8 (diff) | |
| parent | 8947724baa6d595844daeee2f18c865d1886acc5 (diff) | |
Merge from 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 { |