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/llpresetsmanager.h | |
| 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/llpresetsmanager.h')
| -rw-r--r-- | indra/newview/llpresetsmanager.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llpresetsmanager.h b/indra/newview/llpresetsmanager.h index 180cca5bc4..bf6a531d48 100644 --- a/indra/newview/llpresetsmanager.h +++ b/indra/newview/llpresetsmanager.h @@ -39,9 +39,8 @@ static const std::string PRESETS_CAMERA = "camera"; enum EDefaultOptions { - DEFAULT_POSITION_TOP, // Put "Default" as the first item in the combobox - DEFAULT_POSITION_NORMAL, // No special positioning - DEFAULT_HIDE // Do not display "Default" in the combobox + DEFAULT_SHOW, + DEFAULT_HIDE // Do not display "Default" in a list }; class LLPresetsManager : public LLSingleton<LLPresetsManager> |