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

Partial port of Phoenix Windlight parts

Browse Source
This commit is contained in:
Siana Gearz
2012-01-31 05:37:31 +01:00
parent b177324058
commit 071745007a
39 changed files with 4281 additions and 1673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llfloaterenvsettings.cpp
View File

@@ -133,7 +133,7 @@ void LLFloaterEnvSettings::syncMenu()
param_mgr->setDensitySliderValue(param_mgr->mFogDensity.mExp);
// turn off Use Estate Time button if it's already being used
if(LLWLParamManager::getInstance()->mAnimator.mUseLindenTime)
if(LLWLParamManager::getInstance()->mAnimator.getUseLindenTime())
{
childDisable("EnvUseEstateTimeButton");
} else {
@@ -218,8 +218,7 @@ void LLFloaterEnvSettings::onChangeDayTime(LLUICtrl* ctrl, void* userData)
sldr = sEnvSettings->getChild<LLSliderCtrl>("EnvTimeSlider");
// deactivate animator
LLWLParamManager::getInstance()->mAnimator.mIsRunning = false;
LLWLParamManager::getInstance()->mAnimator.mUseLindenTime = false;
LLWLParamManager::getInstance()->mAnimator.deactivate();
F32 val = sldr->getValueF32() + 0.25f;
if(val > 1.0)
@@ -311,8 +310,8 @@ void LLFloaterEnvSettings::onUseEstateTime(void* userData)
box->selectByValue("");
}
LLWLParamManager::getInstance()->mAnimator.mIsRunning = true;
LLWLParamManager::getInstance()->mAnimator.mUseLindenTime = true;
LLWLParamManager::getInstance()->mAnimator.activate(LLWLAnimator::TIME_LINDEN);
LLEnvManagerNew::instance().setUseDayCycle(LLEnvManagerNew::instance().getDayCycleName());
}
std::string LLFloaterEnvSettings::timeToString(F32 curTime)