diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-12 13:46:21 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-12 13:46:21 -0500 |
| commit | dc8a9dc57d41723338a0881a29c5652924977ccf (patch) | |
| tree | 272cd5624749a1ff720ad9674412060c33978cdb /indra/newview/llfloaterwater.cpp | |
| parent | 1e76fc2b1f4e735105f2d45d73ea5a92dbad4e05 (diff) | |
| parent | 6e0ebfe18c431465f6d1bc52e079c7a745419de5 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloaterwater.cpp')
| -rw-r--r-- | indra/newview/llfloaterwater.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llfloaterwater.cpp b/indra/newview/llfloaterwater.cpp index 66a1f6701f..1bbee2625c 100644 --- a/indra/newview/llfloaterwater.cpp +++ b/indra/newview/llfloaterwater.cpp @@ -574,12 +574,10 @@ bool LLFloaterWater::deleteAlertCallback(const LLSD& notification, const LLSD& r LLComboBox* combo_box = getChild<LLComboBox>("WaterPresetsCombo"); 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>("WaterKeyPresets"); - mult_sldr = day_cycle->getChild<LLMultiSliderCtrl>("WaterDayCycleKeys"); } std::string name = combo_box->getSelectedValue().asString(); |