diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2022-03-07 00:19:11 -0800 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-03-07 00:19:11 -0800 |
| commit | 89ab1e4525445d5efc370c381f7c1e18faab8f16 (patch) | |
| tree | 3e1326470eddea3310bfd15867c9d54dd3b1652c /indra/newview/llsetkeybinddialog.h | |
| parent | 40b80251e48d5f0ae3695d9019261f9e472f3e16 (diff) | |
| parent | 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff) | |
Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa
Diffstat (limited to 'indra/newview/llsetkeybinddialog.h')
| -rw-r--r-- | indra/newview/llsetkeybinddialog.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsetkeybinddialog.h b/indra/newview/llsetkeybinddialog.h index 24dfa1dbfd..18e2601723 100644 --- a/indra/newview/llsetkeybinddialog.h +++ b/indra/newview/llsetkeybinddialog.h @@ -85,7 +85,7 @@ private: void setKeyBind(EMouseClickType click, KEY key, MASK mask, bool all_modes); LLKeyBindResponderInterface *pParent; LLCheckBoxCtrl *pCheckBox; - LLTextBase *pDesription; + LLTextBase *pDescription; U32 mKeyFilterMask; Updater *pUpdater; |