diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-02 21:22:17 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-02 21:22:17 +0100 |
| commit | 0c232a77b91df275272011a906cfc8b2eb19725b (patch) | |
| tree | 4d93707189b03e824b91f8672db10a425a54713a /indra/llui/llbutton.cpp | |
| parent | 36a299793c6a26969ec0937e4c40dcf13a806b79 (diff) | |
| parent | e57ae451744f08c1c614ef6903918ba4be6d4674 (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/llui/llbutton.cpp')
| -rw-r--r-- | indra/llui/llbutton.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index a8f72183fd..34f3049f2e 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -636,8 +636,8 @@ void LLButton::draw() if (mFlashing) { - // if we have icon for flashing, use it as image for button - if(flash && mImageFlash->getName() != "FlashIconAbsent") + // if button should flash and we have icon for flashing, use it as image for button + if(flash && mImageFlash) { // setting flash to false to avoid its further influence on glow flash = false; |