diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-26 10:59:37 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-26 10:59:37 -0700 |
| commit | ebce1a4ea8dedcef25c82fa5d877d780b12a3a8f (patch) | |
| tree | 60af20175edacbcbea2b8c75d2ca4baba9d36012 /indra/newview/llsurface.cpp | |
| parent | a40a2a7a465f6e03ca495c301dfbf7bfa376be30 (diff) | |
| parent | 235980dfe3f5683c7871285888001740c1c5d66f (diff) | |
STORM-416 : merge with 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 { |