Skip to content
Snippets Groups Projects
Commit e9515b47 authored by Richard Linden's avatar Richard Linden
Browse files

merge

parents fc8c3a4c 3cd3d9f6
No related branches found
No related tags found
No related merge requests found
...@@ -23,29 +23,27 @@ ...@@ -23,29 +23,27 @@
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$ * $/LicenseInfo$
*/ */
#include "../newview/llviewerprecompiledheaders.h"
#include "llflashtimer.h" #include "llflashtimer.h"
#include "../newview/llviewercontrol.h"
#include "lleventtimer.h" #include "lleventtimer.h"
#include "llui.h"
LLFlashTimer::LLFlashTimer(callback_t cb, S32 count, F32 period) LLFlashTimer::LLFlashTimer(callback_t cb, S32 count, F32 period)
: LLEventTimer(period) : LLEventTimer(period),
, mCallback(cb) mCallback(cb),
, mCurrentTickCount(0) mCurrentTickCount(0),
, mIsFlashingInProgress(false) mIsFlashingInProgress(false),
, mIsCurrentlyHighlighted(false) mIsCurrentlyHighlighted(false),
, mUnset(false) mUnset(false)
{ {
mEventTimer.stop(); mEventTimer.stop();
// By default use settings from settings.xml to be able change them via Debug settings. See EXT-5973. // 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 // 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. // in runtime. So, both settings are made as required restart.
mFlashCount = 2 * ((count > 0) ? count : gSavedSettings.getS32("FlashCount")); mFlashCount = 2 * ((count > 0) ? count : LLUI::sSettingGroups["config"]->getS32("FlashCount"));
if (mPeriod <= 0) if (mPeriod <= 0)
{ {
mPeriod = gSavedSettings.getF32("FlashPeriod"); mPeriod = LLUI::sSettingGroups["config"]->getF32("FlashPeriod");
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment