From fb75cf03a551809552d118ba3871ad5612f3d953 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Tue, 15 Jan 2019 18:43:54 +0200 Subject: SL-10279 allow drag and drop settings on your own parcel --- indra/newview/llpanelenvironment.cpp | 4 ++-- 1 file 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(ICN_GROUND)->setColor((can_enable && isRegion() && !is_legacy) ? LLColor4::white : LLColor4::grey % 0.8f); getChild(ICN_WATER)->setColor((can_enable && isRegion() && !is_legacy) ? LLColor4::white : LLColor4::grey % 0.8f); getChild(BTN_RST_ALTITUDES)->setEnabled(can_enable && isRegion() && !is_legacy); - getChild(PNL_ENVIRONMENT_ALTITUDES)->setEnabled(can_enable && isRegion() && !is_legacy); + getChild(PNL_ENVIRONMENT_ALTITUDES)->setEnabled(can_enable && !is_legacy); getChild(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("sdt_" + alt_prefixes[idx]); if (drop_target) { - drop_target->setDndEnabled(enabled && !is_legacy); + drop_target->setDndEnabled(can_enable && !is_legacy); } } -- cgit v1.2.3