Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Cupcake' of https://github.com/LightDrake/SingularityViewer into Frosting

Browse Source
This commit is contained in:
Lirusaito
2013-03-08 02:57:48 -05:00
parent 06a73061ce b4356107ed
commit 95bd81ee7e
1970 changed files with 661 additions and 4900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llfloaterwindlight.cpp
View File

@@ -875,14 +875,11 @@ bool LLFloaterWindLight::deleteAlertCallback(const LLSD& notification, const LLS
{
LLFloaterDayCycle* day_cycle = NULL;
LLComboBox* key_combo = NULL;
LLMultiSliderCtrl* mult_sldr = NULL;
if(LLFloaterDayCycle::isOpen())
{
day_cycle = LLFloaterDayCycle::instance();
key_combo = day_cycle->getChild<LLComboBox>(
"WLKeyPresets");
mult_sldr = day_cycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys");
key_combo = day_cycle->getChild<LLComboBox>("WLKeyPresets");
}
std::string name(mSkyPresetCombo->getSelectedValue().asString());