diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-05-18 13:33:49 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-05-18 13:33:49 -0700 |
| commit | 9dc8df35c0ae24ed8a1d8329c7b0ac0f71d239bf (patch) | |
| tree | 24d7a43af758fb7de0fa8406cc729a6803b7ed54 /indra/newview/llpanelenvironment.cpp | |
| parent | 4c1a633c232880f4ac6e01807f1084e5d5c68b1e (diff) | |
| parent | e4973e0f92b524e7f9c2d10745f4c5e3a8557284 (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 ab1c7502bb..afbbbd424e 100644 --- a/indra/newview/llpanelenvironment.cpp +++ b/indra/newview/llpanelenvironment.cpp @@ -360,8 +360,8 @@ void LLPanelEnvironmentInfo::onBtnEdit() if (dayeditor) { - dayeditor->setEditCommitSignal(boost::bind(&LLPanelEnvironmentInfo::onEditiCommited, this, _1)); - dayeditor->openFloater(); + dayeditor->setEditCommitSignal(boost::bind(&LLPanelEnvironmentInfo::onEditiCommited, this, _1)); //Not needed? + dayeditor->openFloater(mEditingDayCycle, F32Hours(mDayLengthSlider->getValue().asReal()), F32Hours(mDayOffsetSlider->getValue().asReal())); } } |