diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-06-10 23:44:13 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-06-10 23:44:13 +0300 |
| commit | 4fd946fa3e5217b8f64e0fcd91d268c7eaf1bbf5 (patch) | |
| tree | e5c810ecd44990bce20ff502bce4df08976b80f1 /indra/newview/llenvmanager.cpp | |
| parent | 23d8fb9750afc158d97fdf51633ed59b1b36f223 (diff) | |
STORM-1305 WIP User sky presets now go first in all lists.
Diffstat (limited to 'indra/newview/llenvmanager.cpp')
| -rw-r--r-- | indra/newview/llenvmanager.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp index 462e6293a8..c08ef34685 100644 --- a/indra/newview/llenvmanager.cpp +++ b/indra/newview/llenvmanager.cpp @@ -893,13 +893,14 @@ void LLEnvManagerNew::dumpPresets() // Dump sky presets. LL_DEBUGS("Windlight") << "Skies:" << LL_ENDL; - const std::map<LLWLParamKey, LLWLParamSet> &sky_params_map = LLWLParamManager::getInstance()->mParamList; - for (std::map<LLWLParamKey, LLWLParamSet>::const_iterator it = sky_params_map.begin(); it != sky_params_map.end(); it++) + LLWLParamManager::preset_key_list_t sky_preset_keys; + LLWLParamManager::instance().getPresetKeys(sky_preset_keys); + for (LLWLParamManager::preset_key_list_t::const_iterator it = sky_preset_keys.begin(); it != sky_preset_keys.end(); ++it) { - std::string preset_name = it->first.name; + std::string preset_name = it->name; std::string item_title; - if (it->first.scope == LLEnvKey::SCOPE_LOCAL) // local preset + if (it->scope == LLEnvKey::SCOPE_LOCAL) // local preset { item_title = preset_name; } |