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

Merge

meow-7.2.2
Beq 2018-11-28 23:16:10 +00:00
parent c3ade4bcd6 708d1f6f3a
commit a0c233ea12
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6548,6 +6548,17 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>FSEnableAggressiveComplexityUpdates</key>
<map>
<key>Comment</key>
<string>Enable avctive complexity calculations. This may have a significant detrimental performance impact if enabled.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>FullScreenAspectRatio</key>
<map>
<key>Comment</key>

12
indra/newview/llvoavatar.cpp
View File

@ -11090,9 +11090,12 @@ void LLVOAvatar::calculateUpdateRenderComplexity()
// <FS:Ansariel> Disable useless diagnostics
//static std::set<LLUUID> all_textures;
bool needs_update = mVisualComplexityStale &&
(mVisualComplexity==VISUAL_COMPLEXITY_UNKNOWN ||
mVisualComplexityUpdateTimer.getElapsedTimeF32()>VISUAL_COMPLEXITY_UPDATE_SECONDS);
// <FS:Beq> remove the timer based complexity updates
//bool needs_update = mVisualComplexityStale &&
// (mVisualComplexity==VISUAL_COMPLEXITY_UNKNOWN ||
// mVisualComplexityUpdateTimer.getElapsedTimeF32()>VISUAL_COMPLEXITY_UPDATE_SECONDS);
bool needs_update = mVisualComplexityStale;
if (needs_update)
{
@ -11260,7 +11263,8 @@ void LLVOAvatar::calculateUpdateRenderComplexity()
mVisualComplexity = cost;
}
mVisualComplexityStale = false;
mVisualComplexityUpdateTimer.reset();
// </FS:Beq> Remove the timer for now.
// mVisualComplexityUpdateTimer.reset();
static LLCachedControl<U32> show_my_complexity_changes(gSavedSettings, "ShowMyComplexityChanges", 20);

6
indra/newview/llvovolume.cpp
View File

@ -5613,7 +5613,11 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
vobj = bridge->mDrawable->getVObj();
vol_obj = dynamic_cast<LLVOVolume*>(vobj);
}
if (vol_obj)
// <FS:Beq> option to reduce the number of complexity updates
// if (vol_obj)
static LLCachedControl< bool >aggressiveComplexityUpdates(gSavedSettings, "FSEnableAggressiveComplexityUpdates", false);
if (aggressiveComplexityUpdates && vol_obj)
// </FS:Beq>
{
vol_obj->updateVisualComplexity();
}