From 8a69b9e50dd6e932af2a017353def0883c99d7ac Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Tue, 10 Sep 2013 13:02:17 +0200 Subject: [PATCH] Revert "Patch tool completely misplaced a hunk in previous commit" This reverts commit 99893ee99289049d3b8dbb7b7d851bc8e978753e. --- indra/newview/pipeline.cpp | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 917277822..4b2b52d76 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2833,19 +2833,6 @@ void LLPipeline::shiftObjects(const LLVector3 &offset) mShiftList.resize(0); } - // FIRE-11593: Teleporting more than 4096 regions away clears screen - // The spatial partition octree shift code has problems with - // shifts of more than 4096 regions (1M meters). We shift just - // less than that distance, and let later processing deal with - // all the spatial partitions that are shifted far enough away - // that we'll never see them anyway. - if (offset.length() > MAX_SHIFT_DISTANCE) - { - offseta.splat(MAX_SHIFT_DISTANCE); - } - // FIRE-11593 - - { LLFastTimer t(FTM_SHIFT_OCTREE); for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); @@ -4021,6 +4008,18 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) //LLGLState::checkTextureChannels(); //LLGLState::checkClientArrays(); + // FIRE-11593: Teleporting more than 4096 regions away clears screen + // The spatial partition octree shift code has problems with + // shifts of more than 4096 regions (1M meters). We shift just + // less than that distance, and let later processing deal with + // all the spatial partitions that are shifted far enough away + // that we'll never see them anyway. + if (offset.length() > MAX_SHIFT_DISTANCE) + { + offseta.splat(MAX_SHIFT_DISTANCE); + } + // FIRE-11593 + //stop_glerror();