diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-12 17:13:55 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-12 17:13:55 -0500 |
| commit | 2cabf100e22d4f54ebd0ea6ea20b88985a5654c4 (patch) | |
| tree | a410a41598caf63aeef39b2d0c40741ac372c10f /indra/newview/llfloaterwindlight.cpp | |
| parent | dce57c6b80b1286889da1a6cadda05c864a31851 (diff) | |
| parent | 21be0916a4b707654e99a8c6c734d24e4bb5da7c (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llfloaterwindlight.cpp')
| -rw-r--r-- | indra/newview/llfloaterwindlight.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llfloaterwindlight.cpp b/indra/newview/llfloaterwindlight.cpp index ea6fda7303..c1b15c578c 100644 --- a/indra/newview/llfloaterwindlight.cpp +++ b/indra/newview/llfloaterwindlight.cpp @@ -749,12 +749,10 @@ bool LLFloaterWindLight::deleteAlertCallback(const LLSD& notification, const LLS LLComboBox* combo_box = getChild<LLComboBox>("WLPresetsCombo"); LLFloaterDayCycle* day_cycle = LLFloaterReg::findTypedInstance<LLFloaterDayCycle>("env_day_cycle"); LLComboBox* key_combo = NULL; - LLMultiSliderCtrl* mult_sldr = NULL; if (day_cycle) { key_combo = day_cycle->getChild<LLComboBox>("WLKeyPresets"); - mult_sldr = day_cycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys"); } std::string name(combo_box->getSelectedValue().asString()); |