diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-04-13 18:25:31 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-04-13 18:25:31 +0300 |
| commit | 22b03279a127db6bfce22680ee85d8867da5a883 (patch) | |
| tree | ece0d97a2da6ee6018287b2faf26229e5137ca21 | |
| parent | 8f2981f0cf64ce4fdf6af32799113d99f1552cf7 (diff) | |
MAINT-7313 Connect the recent per attachment reported render weight cap to a debug setting.
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c086e71fae..f0a91fd407 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -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> diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index f6a16f7da1..571dc73013 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -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; |