diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-05-16 13:52:40 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-05-16 13:52:40 +0800 |
| commit | 6d51e91895a7f2435c46a876410ccc6c63fe8c82 (patch) | |
| tree | f2b48ebd99cb414227bf365f47665b8d4baa752b /indra/newview/llsetkeybinddialog.cpp | |
| parent | d1b5917bb9c92e4e47eba19b43781e4d1328b1ca (diff) | |
| parent | 094dcc07f8c1d90ae723dbe60eddacb90a09eae8 (diff) | |
Merge tag '7.1.7-release'
source for viewer 7.1.7.8974243247
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() |