livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix default preset not shown as selected in quick graphics pulldown for non-english languages

master
Ansariel 2016-03-10 10:00:03 +01:00
parent 63c895fe62
commit dbdb1a7a44
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloaterpreference.cpp
View File

@ -4000,7 +4000,7 @@ void LLPanelPreferenceGraphics::setPresetText()
{
if (preset_graphic_active == PRESETS_DEFAULT)
{
preset_graphic_active = LLTrans::getString("Default");
preset_graphic_active = LLTrans::getString(PRESETS_DEFAULT);
}
preset_text->setText(preset_graphic_active);
}

9
indra/newview/llpanelpresetspulldown.cpp
View File

@ -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";