Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
e9515b47
Commit
e9515b47
authored
11 years ago
by
Richard Linden
Browse files
Options
Downloads
Plain Diff
merge
parents
fc8c3a4c
3cd3d9f6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/llui/llflashtimer.cpp
+9
-11
9 additions, 11 deletions
indra/llui/llflashtimer.cpp
with
9 additions
and
11 deletions
indra/llui/llflashtimer.cpp
+
9
−
11
View file @
e9515b47
...
@@ -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"
);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment