summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterdaycycle.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-08-26 16:52:32 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-08-26 16:52:32 +0300
commit19fb0a16695b57e70dc371471d37c16929f1c424 (patch)
tree39f16d806b66e3795ded41c1462e205404996046 /indra/newview/llfloaterdaycycle.cpp
parent8e56f063924601041bac3791e794fa6934f20936 (diff)
parent1a8d917a6d0d2393a0f0248d0072dd7cfd487609 (diff)
Manual merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llfloaterdaycycle.cpp')
-rw-r--r--indra/newview/llfloaterdaycycle.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterdaycycle.cpp b/indra/newview/llfloaterdaycycle.cpp
index 8135fb85d1..aacb543267 100644
--- a/indra/newview/llfloaterdaycycle.cpp
+++ b/indra/newview/llfloaterdaycycle.cpp
@@ -152,11 +152,11 @@ void LLFloaterDayCycle::syncMenu()
// turn off Use Estate Time button if it's already being used
if( LLWLParamManager::instance()->mAnimator.mUseLindenTime == true)
{
- childDisable("WLUseLindenTime");
+ getChildView("WLUseLindenTime")->setEnabled(FALSE);
}
else
{
- childEnable("WLUseLindenTime");
+ getChildView("WLUseLindenTime")->setEnabled(TRUE);
}
}