From 17ce17096f66143776ae1b9dafefcc2dbc85760a Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Thu, 9 Jun 2011 19:00:25 +0300 Subject: STORM-1253 WIP Disabled removing system day cycles. --- indra/newview/llfloaterdeleteenvpreset.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/indra/newview/llfloaterdeleteenvpreset.cpp b/indra/newview/llfloaterdeleteenvpreset.cpp index 3fdbbcae9e..ef50ace357 100644 --- a/indra/newview/llfloaterdeleteenvpreset.cpp +++ b/indra/newview/llfloaterdeleteenvpreset.cpp @@ -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(); -- cgit v1.2.3