From 337beb56f962c4574b500af20538d37d099c8cf3 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 27 Sep 2018 10:13:42 -0700 Subject: Flipped the wrong return value. Fixed the conditional. --- indra/newview/llpanelenvironment.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelenvironment.cpp') diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp index 20aaf258f8..6e2f3450fb 100644 --- a/indra/newview/llpanelenvironment.cpp +++ b/indra/newview/llpanelenvironment.cpp @@ -603,7 +603,7 @@ void LLPanelEnvironmentInfo::onBtnEdit() LLFloaterEditExtDayCycle *dayeditor = getEditFloater(); - LLSD params(LLSDMap(LLFloaterEditExtDayCycle::KEY_EDIT_CONTEXT, isRegion() ? LLFloaterEditExtDayCycle::VALUE_CONTEXT_REGION : LLFloaterEditExtDayCycle::VALUE_CONTEXT_REGION) + LLSD params(LLSDMap(LLFloaterEditExtDayCycle::KEY_EDIT_CONTEXT, isRegion() ? LLFloaterEditExtDayCycle::VALUE_CONTEXT_REGION : LLFloaterEditExtDayCycle::VALUE_CONTEXT_PARCEL) (LLFloaterEditExtDayCycle::KEY_DAY_LENGTH, mCurrentEnvironment ? (S32)(mCurrentEnvironment->mDayLength.value()) : FOURHOURS) (LLFloaterEditExtDayCycle::KEY_CANMOD, LLSD::Boolean(true))); -- cgit v1.2.3 From 6401ed2298f46df6c72526b811a88c5e3b3eee46 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Fri, 28 Sep 2018 15:56:48 +0300 Subject: SL-9620 FIXED Viewer crashes after clicking "Commit" button while editing Day Cycle preset --- indra/newview/llpanelenvironment.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llpanelenvironment.cpp') diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp index 6e2f3450fb..21b9c4edbd 100644 --- a/indra/newview/llpanelenvironment.cpp +++ b/indra/newview/llpanelenvironment.cpp @@ -126,6 +126,8 @@ LLPanelEnvironmentInfo::~LLPanelEnvironmentInfo() { if (mChangeMonitor.connected()) mChangeMonitor.disconnect(); + if (mCommitConnection.connected()) + mCommitConnection.disconnect(); } BOOL LLPanelEnvironmentInfo::postBuild() -- cgit v1.2.3