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

MAINT-7313 Connect the recent per attachment reported render weight cap to a debug setting.

meow-7.2.2
Mnikolenko Productengine 2017-04-13 18:25:31 +03:00
parent 8f2981f0cf
commit 22b03279a1
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10179,6 +10179,17 @@
<key>Value</key>
<integer>10</integer>
</map>
<key>MaxAttachmentComplexity</key>
<map>
<key>Comment</key>
<string>Attachment's render weight limit</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>1.0E6</real>
</map>
<key>ComplexityChangesPopUpDelay</key>
<map>
<key>Comment</key>

4
indra/newview/llvoavatar.cpp
View File

@ -119,7 +119,6 @@ const F32 MAX_HOVER_Z = 2.0;
const F32 MIN_HOVER_Z = -2.0;
const F32 MIN_ATTACHMENT_COMPLEXITY = 0.f;
const F32 MAX_ATTACHMENT_COMPLEXITY = 1.0e6f;
using namespace LLAvatarAppearanceDefines;
@ -9018,7 +9017,8 @@ void LLVOAvatar::calculateUpdateRenderComplexity()
* the official viewer for consideration.
*****************************************************************/
static const U32 COMPLEXITY_BODY_PART_COST = 200;
static LLCachedControl<F32> max_complexity(gSavedSettings,"MaxAttachmentComplexity");
F32 MAX_ATTACHMENT_COMPLEXITY = max_complexity;
// Diagnostic list of all textures on our avatar
static std::set<LLUUID> all_textures;