summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2011-06-09 19:00:25 +0300
committerVadim ProductEngine <vsavchuk@productengine.com>2011-06-09 19:00:25 +0300
commit17ce17096f66143776ae1b9dafefcc2dbc85760a (patch)
tree92fa94b3b72c37822d6485859d4c1bbc722ca965
parentebdb41e5d630cad91dab5372ffc0b4f461a85426 (diff)
STORM-1253 WIP Disabled removing system day cycles.
-rw-r--r--indra/newview/llfloaterdeleteenvpreset.cpp13
1 files 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();