Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Patch tool completely misplaced a hunk in previous commit"

Browse Source 
This reverts commit 99893ee992.
This commit is contained in:
Latif Khalifa
2013-09-10 13:02:17 +02:00
parent 99893ee992
commit 8a69b9e50d
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
indra/newview/pipeline.cpp
View File

@@ -2833,19 +2833,6 @@ void LLPipeline::shiftObjects(const LLVector3 &offset)
mShiftList.resize(0);
}
//<FS:TS> 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);
}
//</FS:TS> 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();
//<FS:TS> 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);
}
//</FS:TS> FIRE-11593
//stop_glerror();