diff options
| author | Don Kjer <don@lindenlab.com> | 2012-07-17 16:52:19 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-07-17 16:52:19 +0000 |
| commit | cff3469d46d297fbec34bc0d648588e900cd255c (patch) | |
| tree | d768ddbc8712c9e81387ae4b03dd8227229a0fe1 /indra/newview/llsurface.cpp | |
| parent | 5a473a42a63d3277c65bb3bc96e49f020508cfe8 (diff) | |
| parent | 509408f393b8eb58799678adde801675a4d4d600 (diff) | |
Merge viewer-development -> viewer-horde-fixes
Diffstat (limited to 'indra/newview/llsurface.cpp')
| -rw-r--r-- | indra/newview/llsurface.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llsurface.cpp b/indra/newview/llsurface.cpp index 66df7dae3e..230e871b49 100644 --- a/indra/newview/llsurface.cpp +++ b/indra/newview/llsurface.cpp @@ -56,6 +56,7 @@ #include "lldrawable.h" extern LLPipeline gPipeline; +extern bool gShiftFrame; LLColor4U MAX_WATER_COLOR(0, 48, 96, 240); @@ -294,7 +295,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); } } @@ -608,6 +609,11 @@ void LLSurface::moveZ(const S32 x, const S32 y, const F32 delta) void LLSurface::updatePatchVisibilities(LLAgent &agent) { + if (gShiftFrame) + { + return; + } + LLVector3 pos_region = mRegionp->getPosRegionFromGlobal(gAgentCamera.getCameraPositionGlobal()); LLSurfacePatch *patchp; |