diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-03 15:18:34 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-03 15:18:34 +0200 |
| commit | e0727702ea00c975361cf94b4d2903a9fec6f6f8 (patch) | |
| tree | d64f1cf4ebf58a08fb7fc197206ce31fab2aa115 /indra/llui/llflashtimer.cpp | |
| parent | c5195905b8c9b30a2b3aab652aa9828e9825c42f (diff) | |
| parent | e58b5263598368b6dec4a836c72c69b50d701911 (diff) | |
Merge branch 'DRTVWR-501' into trunk
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"); } } |