diff options
Diffstat (limited to 'linden/indra/llui')
-rw-r--r-- | linden/indra/llui/llpanel.cpp | 1 | ||||
-rw-r--r-- | linden/indra/llui/llprogressbar.cpp | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp index 07e78ed..361e4f3 100644 --- a/linden/indra/llui/llpanel.cpp +++ b/linden/indra/llui/llpanel.cpp | |||
@@ -1078,7 +1078,6 @@ struct LLLayoutStack::LLEmbeddedPanel | |||
1078 | mVisibleAmt(1.f) // default to fully visible | 1078 | mVisibleAmt(1.f) // default to fully visible |
1079 | { | 1079 | { |
1080 | LLResizeBar::Side side = (orientation == HORIZONTAL) ? LLResizeBar::RIGHT : LLResizeBar::BOTTOM; | 1080 | LLResizeBar::Side side = (orientation == HORIZONTAL) ? LLResizeBar::RIGHT : LLResizeBar::BOTTOM; |
1081 | LLRect resize_bar_rect = panelp->getRect(); | ||
1082 | 1081 | ||
1083 | S32 min_dim; | 1082 | S32 min_dim; |
1084 | if (orientation == HORIZONTAL) | 1083 | if (orientation == HORIZONTAL) |
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); |