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

STORM-1253 WIP Disabled removing system day cycles.

meow-7.2.2
Vadim ProductEngine 2011-06-09 19:00:25 +03:00
parent ebdb41e5d6
commit 17ce17096f
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llfloaterdeleteenvpreset.cpp
View File

@ -248,10 +248,19 @@ void LLFloaterDeleteEnvPreset::populateDayCyclesList()
cur_day = env_mgr.getDayCycleName();
}
const LLDayCycleManager::dc_map_t& map = LLDayCycleManager::instance().getPresets();
LLDayCycleManager& day_mgr = LLDayCycleManager::instance();
const LLDayCycleManager::dc_map_t& map = day_mgr.getPresets();
for (LLDayCycleManager::dc_map_t::const_iterator it = map.begin(); it != map.end(); ++it)
{
mPresetCombo->add(it->first, ADD_BOTTOM, it->first != cur_day);
const std::string& name = it->first;
// list only user presets
if (day_mgr.isSystemPreset(name))
{
continue;
}
mPresetCombo->add(name, ADD_BOTTOM, name != cur_day);
}
postPopulate();