diff options
| author | Jonathan Yap <jhwelch@gmail.com> | 2014-12-12 11:13:11 -0500 |
|---|---|---|
| committer | Jonathan Yap <jhwelch@gmail.com> | 2014-12-12 11:13:11 -0500 |
| commit | 8d12072979ee46a1eb2d13fdfef8bef62ff3f619 (patch) | |
| tree | 280f1334be379b668feadb0214f78d7bbfba62b0 /indra/newview/llpanelpresetspulldown.cpp | |
| parent | 47282ceb7e8b8083cf816dd26bd4907aba313959 (diff) | |
STORM-2082 Merge Hardware floater into main graphics preferences display
Change notifications so they are emitted only when an error occurs
Put active preset at top of list
Add Maximum ARC slider
Merge two small methods into slider update code
Diffstat (limited to 'indra/newview/llpanelpresetspulldown.cpp')
| -rw-r--r-- | indra/newview/llpanelpresetspulldown.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelpresetspulldown.cpp b/indra/newview/llpanelpresetspulldown.cpp index 1918623cab..4756f3bd75 100644 --- a/indra/newview/llpanelpresetspulldown.cpp +++ b/indra/newview/llpanelpresetspulldown.cpp @@ -71,7 +71,7 @@ BOOL LLPanelPresetsPulldown::postBuild() void LLPanelPresetsPulldown::populatePanel() { std::string presets_dir = LLPresetsManager::getInstance()->getPresetsDir(PRESETS_GRAPHIC); - LLPresetsManager::getInstance()->loadPresetNamesFromDir(presets_dir, mPresetNames, DEFAULT_POSITION_NORMAL); + LLPresetsManager::getInstance()->loadPresetNamesFromDir(presets_dir, mPresetNames, DEFAULT_SHOW); LLScrollListCtrl* scroll = getChild<LLScrollListCtrl>("preset_list"); |