diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-02-19 11:48:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-02-19 11:48:04 -0500 |
| commit | e344644849de4a6357a9d48ba6099cd02163f502 (patch) | |
| tree | d41db3bda6bac2160a7ce3399f31ef3f09398604 | |
| parent | 4ecf35abb6362bb899adf0f661e71575e5f83438 (diff) | |
| parent | 448a8d1814b062cb1086c6915be291dfdbe1620e (diff) | |
Merged in maxim_productengine/391-blizzard_maint-6150 (pull request #16)
MAINT-6150 [QuickGraphics] Clicking the blank space in the quick graphics floater will select the first Preset
| -rw-r--r-- | indra/newview/llpanelpresetspulldown.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llpanelpresetspulldown.cpp b/indra/newview/llpanelpresetspulldown.cpp index 175f281ca4..70f5fcd2c0 100644 --- a/indra/newview/llpanelpresetspulldown.cpp +++ b/indra/newview/llpanelpresetspulldown.cpp @@ -89,14 +89,18 @@ void LLPanelPresetsPulldown::populatePanel() row["columns"][0]["column"] = "preset_name"; row["columns"][0]["value"] = name; + bool is_selected_preset = false; if (name == gSavedSettings.getString("PresetGraphicActive")) { row["columns"][1]["column"] = "icon"; row["columns"][1]["type"] = "icon"; row["columns"][1]["value"] = "Check_Mark"; + + is_selected_preset = true; } - scroll->addElement(row); + LLScrollListItem* new_item = scroll->addElement(row); + new_item->setSelected(is_selected_preset); } } } |