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

Backed out changeset: 4df419cb7b2f

meow-7.2.2
andreykproductengine 2016-10-17 22:27:20 +03:00
parent e2224a5d8e
commit c50cb47f1b
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/settings.xml
View File

@ -10282,7 +10282,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>6.5</real>
<real>7.5</real>
</map>
<key>RenderWater</key>
<map>

13
indra/newview/llvovolume.cpp
View File

@ -1257,18 +1257,7 @@ BOOL LLVOVolume::calcLOD()
lod_factor *= LLVOVolume::sRiggedFactorMultiplier;
distance = avatar->mDrawable->mDistanceWRTCamera;
F32 avatar_radius = avatar->getBinRadius();
F32 object_radius;
if (mDrawable.notNull() && !mDrawable->isDead())
{
const LLVector4a* ext = mDrawable->getSpatialExtents();
LLVector4a diff;
diff.setSub(ext[1], ext[0]);
object_radius = diff.getLength3().getF32();
}
else
{
object_radius = getVolume() ? getVolume()->mLODScaleBias.scaledVec(getScale()).length() : getScale().length();
}
F32 object_radius = getVolume() ? getVolume()->mLODScaleBias.scaledVec(getScale()).length() : getScale().length();
radius = object_radius * LLVOVolume::sRiggedFactorMultiplier;
radius = llmin(radius, avatar_radius);
}