diff options
Diffstat (limited to 'indra/newview/llfloaterwater.cpp')
| -rw-r--r-- | indra/newview/llfloaterwater.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llfloaterwater.cpp b/indra/newview/llfloaterwater.cpp index 30bec8a77a..4d647f30f5 100644 --- a/indra/newview/llfloaterwater.cpp +++ b/indra/newview/llfloaterwater.cpp @@ -90,10 +90,11 @@ BOOL LLFloaterWater::postBuild() if(comboBox != NULL) { - const LLWaterParamManager::preset_map_t& preset_map = LLWaterParamManager::getInstance()->getPresets(); - for (LLWaterParamManager::preset_map_t::const_iterator it = preset_map.begin(); it != preset_map.end(); ++it) + LLWaterParamManager::preset_name_list_t presets; + LLWaterParamManager::instance().getPresetNames(presets); + for (LLWaterParamManager::preset_name_list_t::const_iterator it = presets.begin(); it != presets.end(); ++it) { - comboBox->add(it->first); + comboBox->add(*it); } // set defaults on combo boxes |