diff options
| author | Tofu Buzzard <no-email> | 2010-10-27 11:03:39 +0100 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2010-10-27 11:03:39 +0100 |
| commit | 179e9e37ecbdcd1ad2133733047707ddd42e8c30 (patch) | |
| tree | db3d1d07ea7e2c769562eeb2f5ad09587df376f6 /indra/newview/llsurface.cpp | |
| parent | 26700e0d40c5f650e713f5209dd80b5df84b2b5a (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 { |