diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-05-23 13:02:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-23 13:02:08 -0700 |
| commit | 0cc832c38a34013a9eebf8d3caad2921bead265d (patch) | |
| tree | 8d916206343d075fc85e90e83ec9dabe8b01376d /indra/newview/llsetkeybinddialog.cpp | |
| parent | 03c4458bdcc6821a3047f93b729d412e274ab9af (diff) | |
| parent | 9f6849e081deac1f62ab3010ee0984e17749c9e6 (diff) | |
Merge pull request #1528 from secondlife/brad/merge-maint-a-to-dev
merge maint-a (including maint-x) into gltf_development
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 dc3b34b1b9..6508220c1e 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() |