diff options
| author | Nicky <nicky.dasmijn@posteo.nl> | 2024-05-22 11:05:51 +0200 |
|---|---|---|
| committer | Nicky <nicky.dasmijn@posteo.nl> | 2024-05-22 11:05:51 +0200 |
| commit | ad59ffd4bc7bc77b260da6152a188f6b2ab59d05 (patch) | |
| tree | 169edbab006d8bbd86b2980ab98fb62e097067ff /indra/newview/llsetkeybinddialog.cpp | |
| parent | 3dc5fa00753bb889280771a2cd17029aa1e42f24 (diff) | |
| parent | ec23d45e2e9a87147641fed6f8c3ef6083c2f878 (diff) | |
Merge remote-tracking branch 'mkd/pipewire-linux-volume-catcher' into pipewire-linux-volume-catcher
Diffstat (limited to 'indra/newview/llsetkeybinddialog.cpp')
| -rw-r--r-- | indra/newview/llsetkeybinddialog.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llsetkeybinddialog.cpp b/indra/newview/llsetkeybinddialog.cpp index 74844a80e8..dbab7e53b6 100644 --- a/indra/newview/llsetkeybinddialog.cpp +++ b/indra/newview/llsetkeybinddialog.cpp @@ -74,13 +74,10 @@ LLSetKeyBindDialog::LLSetKeyBindDialog(const LLSD& key) pUpdater(NULL), mLastMaskKey(0), mContextConeOpacity(0.f), - mContextConeInAlpha(0.f), - mContextConeOutAlpha(0.f), - mContextConeFadeTime(0.f) + mContextConeInAlpha(CONTEXT_CONE_IN_ALPHA), + mContextConeOutAlpha(CONTEXT_CONE_OUT_ALPHA), + mContextConeFadeTime(CONTEXT_CONE_FADE_TIME) { - mContextConeInAlpha = gSavedSettings.getF32("ContextConeInAlpha"); - mContextConeOutAlpha = gSavedSettings.getF32("ContextConeOutAlpha"); - mContextConeFadeTime = gSavedSettings.getF32("ContextConeFadeTime"); } LLSetKeyBindDialog::~LLSetKeyBindDialog() |