diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-19 10:47:00 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-19 10:47:00 +0300 |
commit | 63004f50e320b6df29993a9b50cbf176daf13616 (patch) | |
tree | 7842c479ef0fb6eefc917e993d9d43ce1c43ce81 /indra/newview/llfloatersaveprefpreset.h | |
parent | 70fe69ea43d896da096f767d530f18a702c5d7a6 (diff) | |
parent | ed3d9abdd01304b5a9708880d9b150fb6568256b (diff) |
Merge branch 'master' into DRTVWR-482
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; |