diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-12 02:37:15 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-12 02:37:15 +0200 |
| commit | 5f731d84cb5823bdc4cae5be288f2de2ffb9f5f9 (patch) | |
| tree | 04ddffec7d5a004150aefd5fdbf247863e2a8926 /indra/llui/llflashtimer.cpp | |
| parent | 4aa9dfec746f28696a195fe81aed9b6ef0791954 (diff) | |
| parent | e96d0d5e304324e6ab0c469773fb7110a65fc3f1 (diff) | |
Downstream merge from 494-maint-wassail
Diffstat (limited to 'indra/llui/llflashtimer.cpp')
| -rw-r--r-- | indra/llui/llflashtimer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llflashtimer.cpp b/indra/llui/llflashtimer.cpp index 6d9c429b08..39793316f4 100644 --- a/indra/llui/llflashtimer.cpp +++ b/indra/llui/llflashtimer.cpp @@ -40,10 +40,10 @@ LLFlashTimer::LLFlashTimer(callback_t cb, S32 count, F32 period) // By default use settings from settings.xml to be able change them via Debug settings. See EXT-5973. // Due to Timer is implemented as derived class from EventTimer it is impossible to change period // in runtime. So, both settings are made as required restart. - mFlashCount = 2 * ((count > 0) ? count : LLUI::sSettingGroups["config"]->getS32("FlashCount")); + mFlashCount = 2 * ((count > 0) ? count : LLUI::getInstance()->mSettingGroups["config"]->getS32("FlashCount")); if (mPeriod <= 0) { - mPeriod = LLUI::sSettingGroups["config"]->getF32("FlashPeriod"); + mPeriod = LLUI::getInstance()->mSettingGroups["config"]->getF32("FlashPeriod"); } } |