From 4fd946fa3e5217b8f64e0fcd91d268c7eaf1bbf5 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Fri, 10 Jun 2011 23:44:13 +0300 Subject: STORM-1305 WIP User sky presets now go first in all lists. --- indra/newview/llenvmanager.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'indra/newview/llenvmanager.cpp') 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 &sky_params_map = LLWLParamManager::getInstance()->mParamList; - for (std::map::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; } -- cgit v1.3