diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-09-20 10:00:55 -0400 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-09-20 10:00:55 -0400 |
| commit | 683c43c2e0f6e4d34592528c219f34f638059223 (patch) | |
| tree | 76e5d3d5e8a5912ede190ec91686d16e0d730f2a /indra/newview/llsurface.cpp | |
| parent | 8d3885f3bdca588efdef35e5d9c78d20036e81a9 (diff) | |
reapply 448b02f5b56f: MAINT-1147 Fix for frame stall on region crossing.
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 94907ee4cc..f64a72a616 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); @@ -621,6 +622,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; |