livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backout of c83a5e68ecdd[ 'FIRE-11593: Don't try shifting spatial partitions more than 1M meters on teleport.' ] it has undesired sideeffects.

master
Nicky 2013-09-10 11:09:05 +02:00
parent a36870d16a
commit 2eb3ddb149
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/pipeline.cpp
View File

@ -215,10 +215,6 @@ const U32 DEFERRED_VB_MASK = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TE
// Max number of occluders to search for. JC
const S32 MAX_OCCLUDER_COUNT = 2;
//<FS:TS> FIRE-11593: Teleporting more than 4096 regions away clears screen
const F32 MAX_SHIFT_DISTANCE = 256.f * 4095; //maximum distance to shift spatial partitions
//</FS:TS> FIRE-11593
extern S32 gBoxFrame;
//extern BOOL gHideSelectedObjects;
extern BOOL gDisplaySwapBuffers;
@ -3247,17 +3243,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);