From ab7f0b2ecdb194a136e26a1ee9ee0216f060006e Mon Sep 17 00:00:00 2001 From: ziree Date: Sat, 26 Oct 2019 23:19:09 +0200 Subject: [PATCH] Fixed default checkbox in FS AO enabling when the set already is the default - FIRE-29101 --- indra/newview/ao.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/ao.cpp b/indra/newview/ao.cpp index bfd36b1fe1..eba236ea90 100644 --- a/indra/newview/ao.cpp +++ b/indra/newview/ao.cpp @@ -85,7 +85,7 @@ void FloaterAO::updateSetParameters() mOverrideSitsCheckBoxSmall->setValue(mSelectedSet->getSitOverride()); mSmartCheckBox->setValue(mSelectedSet->getSmart()); mDisableMouselookCheckBox->setValue(mSelectedSet->getMouselookDisable()); - BOOL isDefault = (mSelectedSet == AOEngine::instance().getDefaultSet()) ? TRUE : FALSE; + BOOL isDefault = (mSelectedSet == AOEngine::instance().getDefaultSet()); mDefaultCheckBox->setValue(isDefault); mDefaultCheckBox->setEnabled(!isDefault); updateSmart(); @@ -282,7 +282,7 @@ void FloaterAO::enableSetControls(BOOL yes) mSetSelectorSmall->setEnabled(yes); mActivateSetButton->setEnabled(yes); mRemoveButton->setEnabled(yes); - mDefaultCheckBox->setEnabled(yes); + mDefaultCheckBox->setEnabled(yes && (mSelectedSet != AOEngine::instance().getDefaultSet())); mOverrideSitsCheckBox->setEnabled(yes); mOverrideSitsCheckBoxSmall->setEnabled(yes); mDisableMouselookCheckBox->setEnabled(yes);