summaryrefslogtreecommitdiff
path: root/indra/newview/llsurface.cpp
diff options
context:
space:
mode:
authorsimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-09-20 10:00:54 -0400
committersimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-09-20 10:00:54 -0400
commit8d3885f3bdca588efdef35e5d9c78d20036e81a9 (patch)
tree95ff1290546dec23678f8e763151a1826a894128 /indra/newview/llsurface.cpp
parentb4c8a982fc863debe28407d4cc3519b111309725 (diff)
reapply 8a625610cd5d: MAINT-1161: non standard sea level not correctly rendered around private islands.
Reviewed by Kelly
Diffstat (limited to 'indra/newview/llsurface.cpp')
-rw-r--r--indra/newview/llsurface.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsurface.cpp b/indra/newview/llsurface.cpp
index 65393cc168..94907ee4cc 100644
--- a/indra/newview/llsurface.cpp
+++ b/indra/newview/llsurface.cpp
@@ -294,7 +294,7 @@ void LLSurface::initTextures()
mWaterObjp = (LLVOWater *)gObjectList.createObjectViewer(LLViewerObject::LL_VO_WATER, mRegionp);
gPipeline.createObject(mWaterObjp);
LLVector3d water_pos_global = from_region_handle(mRegionp->getHandle());
- water_pos_global += LLVector3d(128.0, 128.0, DEFAULT_WATER_HEIGHT);
+ water_pos_global += LLVector3d(128.0, 128.0, DEFAULT_WATER_HEIGHT); // region doesn't have a valid water height yet
mWaterObjp->setPositionGlobal(water_pos_global);
}
}