diff options
author | tiggs@lindenlab.com <tiggs@lindenlab.com> | 2011-02-23 17:44:18 -0500 |
---|---|---|
committer | tiggs@lindenlab.com <tiggs@lindenlab.com> | 2011-02-23 17:44:18 -0500 |
commit | 758fdbfe125d75bd2253a69337eab7fec7406ecf (patch) | |
tree | 4bead0bf6b11efc55d5eb91d2b3b25d44fdb5c31 /indra/newview/llfloaterdaycycle.cpp | |
parent | 6bb02e0e260df2d00ab53376cf15af5e7e2fd12f (diff) |
STORM-1126 WIP Windlight Estate Settings port from 1.23: baseline: read only windlight works
(resubmitted by Vadim ProductEngine)
Diffstat (limited to 'indra/newview/llfloaterdaycycle.cpp')
-rw-r--r-- | indra/newview/llfloaterdaycycle.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llfloaterdaycycle.cpp b/indra/newview/llfloaterdaycycle.cpp index c54540d827..8979c7d6f7 100644 --- a/indra/newview/llfloaterdaycycle.cpp +++ b/indra/newview/llfloaterdaycycle.cpp @@ -338,10 +338,12 @@ void LLFloaterDayCycle::onStopAnimSky(void* userData) void LLFloaterDayCycle::onUseLindenTime(void* userData) { - LLFloaterWindLight* wl = LLFloaterWindLight::instance(); - LLComboBox* box = wl->getChild<LLComboBox>("WLPresetsCombo"); - box->selectByValue(""); - + LLFloaterWindLight* wlfloater = LLFloaterReg::findTypedInstance<LLFloaterWindLight>("env_windlight"); + if (wlfloater) + { + LLComboBox* box = wlfloater->getChild<LLComboBox>("WLPresetsCombo"); + box->selectByValue(""); + } LLWLParamManager::getInstance()->mAnimator.deactivate(); } |