diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-02-17 22:17:45 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-02-17 22:17:45 +0000 |
| commit | 2cad61d76ba48fe2adfda120bc21ca66166b7385 (patch) | |
| tree | ab0e80b363385cd6335f133ca0a0a0488f92c8f3 /indra/newview/llfloaterpreference.cpp | |
| parent | de711c213820521aa8afcf991b4af561db54aede (diff) | |
| parent | 57e0d91d16b28758c41bc6fa96ecb42908d591c5 (diff) | |
Merged in DV528-merge-6.4.14 (pull request #476)
DRTVWR-528 merge up to v 6.4.14
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 1cd8841bb4..bafebf7bc1 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -1479,7 +1479,7 @@ void LLAvatarComplexityControls::setIndirectMaxNonImpostors() { U32 max_non_impostors = gSavedSettings.getU32("RenderAvatarMaxNonImpostors"); // for this one, we just need to make zero, which means off, the max value of the slider - U32 indirect_max_non_impostors = (0 == max_non_impostors) ? LLVOAvatar::IMPOSTORS_OFF : max_non_impostors; + U32 indirect_max_non_impostors = (0 == max_non_impostors) ? LLVOAvatar::NON_IMPOSTORS_MAX_SLIDER : max_non_impostors; gSavedSettings.setU32("IndirectMaxNonImpostors", indirect_max_non_impostors); } @@ -1979,7 +1979,7 @@ void LLFloaterPreferenceGraphicsAdvanced::updateMaxNonImpostors() LLSliderCtrl* ctrl = getChild<LLSliderCtrl>("IndirectMaxNonImpostors",true); U32 value = ctrl->getValue().asInteger(); - if (0 == value || LLVOAvatar::IMPOSTORS_OFF <= value) + if (0 == value || LLVOAvatar::NON_IMPOSTORS_MAX_SLIDER <= value) { value=0; } |