diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-10-01 17:17:29 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-10-01 17:17:29 +0100 |
| commit | c4941fc182585769e8e3151f98127c9b8c3221f2 (patch) | |
| tree | 84e347ae2573ce5b538f124a0ce95f3a50fc69c7 /indra/newview/llpanelenvironment.cpp | |
| parent | ae099c639fe45a13454d50526b1c8610ee98ea83 (diff) | |
| parent | ee2720d0a1d9153547a6012d6b31c6bfff4e37a7 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpanelenvironment.cpp')
| -rw-r--r-- | indra/newview/llpanelenvironment.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp index 20aaf258f8..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() @@ -603,7 +605,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))); |