diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-27 22:58:52 +0200 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-27 22:58:52 +0200 |
commit | bc496f5f17a446af27b47cbe227e7e85089bab8d (patch) | |
tree | b7c90fee48d1f48e21c5f62fe84abaca16f8bb81 /indra/llui/llflashtimer.cpp | |
parent | 91c311dd7beb8d723a00efac8e61019eeb8af17b (diff) | |
parent | f89c9e9b20a13acd8f6af76699259cab4c74d5db (diff) |
Downstream merge from lindenlab/viewer-lynx
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"); } } |