diff options
| author | David Walter Seikel | 2014-02-03 15:23:22 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2014-02-03 15:23:22 +1000 |
| commit | d056a17f05a1f90708f554651475e116a2ddbd68 (patch) | |
| tree | 07fa4f1cca2a25548b8d2d6b4752b07d8efbd2ff /linden/indra/llui/llprogressbar.cpp | |
| parent | Updating tree and volume LOD. These go to eleven. (diff) | |
| parent | Fix up OTR prefs to not crash. (diff) | |
| download | meta-impy-next.zip meta-impy-next.tar.gz meta-impy-next.tar.bz2 meta-impy-next.tar.xz | |
Diffstat (limited to 'linden/indra/llui/llprogressbar.cpp')
| -rw-r--r-- | linden/indra/llui/llprogressbar.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/linden/indra/llui/llprogressbar.cpp b/linden/indra/llui/llprogressbar.cpp index d148733..0000d77 100644 --- a/linden/indra/llui/llprogressbar.cpp +++ b/linden/indra/llui/llprogressbar.cpp | |||
| @@ -83,9 +83,6 @@ void LLProgressBar::draw() | |||
| 83 | bar_bg_imagep->draw(getLocalRect(), | 83 | bar_bg_imagep->draw(getLocalRect(), |
| 84 | background_color); | 84 | background_color); |
| 85 | 85 | ||
| 86 | F32 alpha = 0.5f + 0.5f*0.5f*(1.f + (F32)sin(3.f*timer.getElapsedTimeF32())); | ||
| 87 | LLColor4 bar_color = LLUI::sColorsGroup->getColor("LoginProgressBarFgColor"); | ||
| 88 | bar_color.mV[3] = alpha; | ||
| 89 | LLRect progress_rect = getLocalRect(); | 86 | LLRect progress_rect = getLocalRect(); |
| 90 | progress_rect.mRight = llround(getRect().getWidth() * (mPercentDone / 100.f)); | 87 | progress_rect.mRight = llround(getRect().getWidth() * (mPercentDone / 100.f)); |
| 91 | bar_fg_imagep->draw(progress_rect); | 88 | bar_fg_imagep->draw(progress_rect); |