diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-05-19 10:58:29 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-05-19 10:58:29 -0600 |
| commit | 9edfdf06cc50739682458ef54c62676f5882e949 (patch) | |
| tree | bfdbc2e3d13810b953d14c9557735a0548c7daf5 /indra/newview/llfloatersaveprefpreset.h | |
| parent | 4488e03a93b17a2b0f30a5081e1e267b5c1c8a06 (diff) | |
| parent | ed3d9abdd01304b5a9708880d9b150fb6568256b (diff) | |
Merge branch 'master' into DRTVWR-510
Merge DRTVWR-460 changes in master (v 6.4.3) into the 510 branch.
Diffstat (limited to 'indra/newview/llfloatersaveprefpreset.h')
| -rw-r--r-- | indra/newview/llfloatersaveprefpreset.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatersaveprefpreset.h b/indra/newview/llfloatersaveprefpreset.h index 09a87b8c62..ae58180e7f 100644 --- a/indra/newview/llfloatersaveprefpreset.h +++ b/indra/newview/llfloatersaveprefpreset.h @@ -1,6 +1,6 @@ /** * @file llfloatersaveprefpreset.h - * @brief Floater to save a graphics / camera preset + * @brief Floater to save a graphics preset * * $LicenseInfo:firstyear=2014&license=viewerlgpl$ @@ -45,6 +45,7 @@ public: void onBtnCancel(); private: + LLComboBox* mPresetCombo; LLButton* mSaveButton; |