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

MAINT-5015 (Nearby objects often load at wrong LOD at login or after intra-region teleports) 

The idea and reason in this fix is same as for a MAINT-4297, MAINT-4449, BUG-7239
i.e. it's a just a little another case.
meow-7.2.2
ruslantproductengine 2015-07-13 17:59:50 +03:00
parent f2c82b096b
commit 4a3d2eff64
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llvovolume.cpp
View File

@ -1639,7 +1639,7 @@ bool LLVOVolume::lodOrSculptChanged(LLDrawable *drawable, BOOL &compiled)
{
LL_RECORD_BLOCK_TIME(FTM_GEN_VOLUME);
LLVolumeParams volume_params = getVolume()->getParams();
const LLVolumeParams &volume_params = getVolume()->getParams();
setVolume(volume_params, 0);
}
@ -1724,8 +1724,6 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable)
return TRUE; // No update to complete
}
boost::function<bool(void)> fn_lod_or_sculpt_changed = boost::bind(&LLVOVolume::lodOrSculptChanged, this, drawable, boost::ref(compiled));
if (mVolumeChanged || mFaceMappingChanged)
{
dirtySpatialGroup(drawable->isState(LLDrawable::IN_REBUILD_Q1));
@ -1734,13 +1732,13 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable)
if (mVolumeChanged)
{
was_regen_faces = fn_lod_or_sculpt_changed();
was_regen_faces = lodOrSculptChanged(drawable, compiled);
drawable->setState(LLDrawable::REBUILD_VOLUME);
}
else if (mSculptChanged)
else if (mSculptChanged || mLODChanged)
{
compiled = TRUE;
was_regen_faces = fn_lod_or_sculpt_changed();
was_regen_faces = lodOrSculptChanged(drawable, compiled);
}
if (!was_regen_faces) {
@ -1754,7 +1752,7 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable)
{
dirtySpatialGroup(drawable->isState(LLDrawable::IN_REBUILD_Q1));
compiled = TRUE;
fn_lod_or_sculpt_changed();
lodOrSculptChanged(drawable, compiled);
genBBoxes(FALSE);
}
// it has its own drawable (it's moved) or it has changed UVs or it has changed xforms from global<->local