diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-13 18:06:49 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-13 18:06:49 -0500 |
| commit | 9605da154efc0b4913bc68082b8876b660d205b1 (patch) | |
| tree | da58722a5ef1d3e02a849d5ce986eb22a968d41f /indra/newview/llsurface.cpp | |
| parent | c559e3d6b93216496065cd05dd2734b726d61201 (diff) | |
| parent | b93a23aa828a2ee6de206fe3c74d1b0f3e116db1 (diff) | |
merge
Diffstat (limited to 'indra/newview/llsurface.cpp')
| -rw-r--r-- | indra/newview/llsurface.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llsurface.cpp b/indra/newview/llsurface.cpp index 54a259f725..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); @@ -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; |