diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-03-02 15:34:38 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-03-02 15:34:38 +0200 |
| commit | 54ded3678781f9a5c3b18bb4512918613e35198f (patch) | |
| tree | 36b5cf7a01bc8274c2c5ba26bdf6ac6c20f8acfe /indra/newview | |
| parent | 5f846e4229c97e6540634dac89963d05d548ab24 (diff) | |
SL-12755 [EEP] The sky level dropdown is not disabled for folders
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llsettingspicker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsettingspicker.cpp b/indra/newview/llsettingspicker.cpp index b47821ddf2..d2d21063e7 100644 --- a/indra/newview/llsettingspicker.cpp +++ b/indra/newview/llsettingspicker.cpp @@ -271,7 +271,7 @@ void LLFloaterSettingsPicker::onSelectionChange(const LLFloaterSettingsPicker::i } bool track_picker_enabled = mTrackMode != TRACK_NONE; - getChild<LLView>(CMB_TRACK_SELECTION)->setEnabled(track_picker_enabled && mSettingAssetID == asset_id); + getChild<LLView>(CMB_TRACK_SELECTION)->setEnabled(is_item && track_picker_enabled && mSettingAssetID == asset_id); getChild<LLView>(BTN_SELECT)->setEnabled(is_item && (!track_picker_enabled || mSettingAssetID == asset_id)); if (track_picker_enabled && asset_id.notNull() && mSettingAssetID != asset_id) { |