From 54ded3678781f9a5c3b18bb4512918613e35198f Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 2 Mar 2020 15:34:38 +0200 Subject: SL-12755 [EEP] The sky level dropdown is not disabled for folders --- indra/newview/llsettingspicker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') 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(CMB_TRACK_SELECTION)->setEnabled(track_picker_enabled && mSettingAssetID == asset_id); + getChild(CMB_TRACK_SELECTION)->setEnabled(is_item && track_picker_enabled && mSettingAssetID == asset_id); getChild(BTN_SELECT)->setEnabled(is_item && (!track_picker_enabled || mSettingAssetID == asset_id)); if (track_picker_enabled && asset_id.notNull() && mSettingAssetID != asset_id) { -- cgit v1.2.3