diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-01-15 14:41:09 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-01-15 14:41:09 -0800 |
| commit | ae8f0b9ee3d0e36fb030d073a9c332d07ac82837 (patch) | |
| tree | b2d48dceaf3ca0b9aae8a520f895625a08b4e074 /indra/newview/llpanelenvironment.cpp | |
| parent | 38c84545cc8c2c3704402d009d9bce253aa77939 (diff) | |
| parent | fb75cf03a551809552d118ba3871ad5612f3d953 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpanelenvironment.cpp')
| -rw-r--r-- | indra/newview/llpanelenvironment.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp index f84ceb6853..c2827e451f 100644 --- a/indra/newview/llpanelenvironment.cpp +++ b/indra/newview/llpanelenvironment.cpp @@ -457,7 +457,7 @@ bool LLPanelEnvironmentInfo::setControlsEnabled(bool enabled) getChild<LLUICtrl>(ICN_GROUND)->setColor((can_enable && isRegion() && !is_legacy) ? LLColor4::white : LLColor4::grey % 0.8f); getChild<LLUICtrl>(ICN_WATER)->setColor((can_enable && isRegion() && !is_legacy) ? LLColor4::white : LLColor4::grey % 0.8f); getChild<LLUICtrl>(BTN_RST_ALTITUDES)->setEnabled(can_enable && isRegion() && !is_legacy); - getChild<LLUICtrl>(PNL_ENVIRONMENT_ALTITUDES)->setEnabled(can_enable && isRegion() && !is_legacy); + getChild<LLUICtrl>(PNL_ENVIRONMENT_ALTITUDES)->setEnabled(can_enable && !is_legacy); getChild<LLUICtrl>(CHK_ALLOWOVERRIDE)->setEnabled(can_enable && isRegion() && !is_legacy); for (U32 idx = 0; idx < ALTITUDE_MARKERS_COUNT; idx++) @@ -475,7 +475,7 @@ bool LLPanelEnvironmentInfo::setControlsEnabled(bool enabled) LLSettingsDropTarget* drop_target = findChild<LLSettingsDropTarget>("sdt_" + alt_prefixes[idx]); if (drop_target) { - drop_target->setDndEnabled(enabled && !is_legacy); + drop_target->setDndEnabled(can_enable && !is_legacy); } } |