livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-1253 WIP Disable removing current day cycle.

meow-7.2.2
Vadim ProductEngine 2011-06-07 19:19:02 +03:00
parent 3519c6cd6b
commit 4ebfc47e40
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfloaterdeleteenvpreset.cpp
View File

@ -222,11 +222,17 @@ void LLFloaterDeleteEnvPreset::populateDayCyclesList()
mPresetCombo->removeall();
// *TODO: Disable current day cycle.
std::string cur_day;
LLEnvManagerNew& env_mgr = LLEnvManagerNew::instance();
if (!env_mgr.getUseRegionSettings() && env_mgr.getUseDayCycle())
{
cur_day = env_mgr.getDayCycleName();
}
const LLDayCycleManager::dc_map_t& map = LLDayCycleManager::instance().getPresets();
for (LLDayCycleManager::dc_map_t::const_iterator it = map.begin(); it != map.end(); ++it)
{
mPresetCombo->add(it->first);
mPresetCombo->add(it->first, ADD_BOTTOM, it->first != cur_day);
}
postPopulate();