diff options
Diffstat (limited to 'linden/indra/newview/llfloaterwindlight.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterwindlight.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp index 4937232..52d6e14 100644 --- a/linden/indra/newview/llfloaterwindlight.cpp +++ b/linden/indra/newview/llfloaterwindlight.cpp | |||
@@ -873,7 +873,7 @@ void LLFloaterWindLight::onSavePreset(LLUICtrl* ctrl, void* userData) | |||
873 | { | 873 | { |
874 | // Make sure we have a ".wl" extension. | 874 | // Make sure we have a ".wl" extension. |
875 | std::string name = comboBox->getSelectedItemLabel(); | 875 | std::string name = comboBox->getSelectedItemLabel(); |
876 | if(name.length() > 2 && name.compare(name.length() - 3, 3, ".wl") != 0) | 876 | if(!LLWLParamManager::isSkySettingsNotecard(name)) |
877 | { | 877 | { |
878 | name += ".wl"; | 878 | name += ".wl"; |
879 | } | 879 | } |
@@ -973,14 +973,12 @@ bool LLFloaterWindLight::deleteAlertCallback(const LLSD& notification, const LLS | |||
973 | "WLPresetsCombo"); | 973 | "WLPresetsCombo"); |
974 | LLFloaterDayCycle* day_cycle = NULL; | 974 | LLFloaterDayCycle* day_cycle = NULL; |
975 | LLComboBox* key_combo = NULL; | 975 | LLComboBox* key_combo = NULL; |
976 | LLMultiSliderCtrl* mult_sldr = NULL; | ||
977 | 976 | ||
978 | if(LLFloaterDayCycle::isOpen()) | 977 | if(LLFloaterDayCycle::isOpen()) |
979 | { | 978 | { |
980 | day_cycle = LLFloaterDayCycle::instance(); | 979 | day_cycle = LLFloaterDayCycle::instance(); |
981 | key_combo = day_cycle->getChild<LLComboBox>( | 980 | key_combo = day_cycle->getChild<LLComboBox>( |
982 | "WLKeyPresets"); | 981 | "WLKeyPresets"); |
983 | mult_sldr = day_cycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys"); | ||
984 | } | 982 | } |
985 | 983 | ||
986 | std::string name(combo_box->getSelectedValue().asString()); | 984 | std::string name(combo_box->getSelectedValue().asString()); |