diff options
| author | Ansariel <none@none> | 2016-03-10 10:00:03 +0100 |
|---|---|---|
| committer | Ansariel <none@none> | 2016-03-10 10:00:03 +0100 |
| commit | 6f799b0a587c53587edd1dbef8ec69ca974b9a85 (patch) | |
| tree | ee18b03940df7b688167d869893f3dfdeb9c071b /indra/newview/llpanelpresetspulldown.cpp | |
| parent | 6fb7c6b43cfbe4cc56c8123780a8272ca06222a1 (diff) | |
Fix default preset not shown as selected in quick graphics pulldown for non-english languages
Diffstat (limited to 'indra/newview/llpanelpresetspulldown.cpp')
| -rw-r--r-- | indra/newview/llpanelpresetspulldown.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llpanelpresetspulldown.cpp b/indra/newview/llpanelpresetspulldown.cpp index 70f5fcd2c0..9b4dc5474a 100644 --- a/indra/newview/llpanelpresetspulldown.cpp +++ b/indra/newview/llpanelpresetspulldown.cpp @@ -38,6 +38,7 @@ #include "llpresetsmanager.h" #include "llsliderctrl.h" #include "llscrolllistctrl.h" +#include "lltrans.h" /* static */ const F32 LLPanelPresetsPulldown::sAutoCloseFadeStartTimeSec = 2.0f; /* static */ const F32 LLPanelPresetsPulldown::sAutoCloseTotalTimeSec = 3.0f; @@ -80,6 +81,12 @@ void LLPanelPresetsPulldown::populatePanel() { scroll->clearRows(); + std::string active_preset = gSavedSettings.getString("PresetGraphicActive"); + if (active_preset == PRESETS_DEFAULT) + { + active_preset = LLTrans::getString(PRESETS_DEFAULT); + } + for (std::list<std::string>::const_iterator it = mPresetNames.begin(); it != mPresetNames.end(); ++it) { const std::string& name = *it; @@ -90,7 +97,7 @@ void LLPanelPresetsPulldown::populatePanel() row["columns"][0]["value"] = name; bool is_selected_preset = false; - if (name == gSavedSettings.getString("PresetGraphicActive")) + if (name == active_preset) { row["columns"][1]["column"] = "icon"; row["columns"][1]["type"] = "icon"; |