Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.

Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry

1 files changed, 2 insertions, 8 deletions

diff --git a/indra/llui/llprogressbar.cpp b/indra/llui/llprogressbar.cpp
index 7a34cc6792..c8b6e814e1 100644
--- a/indra/llui/llprogressbar.cpp
+++ b/indra/llui/llprogressbar.cpp
@@ -50,10 +50,7 @@ static LLDefaultChildRegistry::Register<LLProgressBar> r("progress_bar");
 LLProgressBar::Params::Params()
 :	image_bar("image_bar"),
 	image_fill("image_fill"),
-	image_shadow("image_shadow"),
 	color_bar("color_bar"),
-	color_bar2("color_bar2"),
-	color_shadow("color_shadow"),
 	color_bg("color_bg")
 {}
 
@@ -61,12 +58,9 @@ LLProgressBar::Params::Params()
 LLProgressBar::LLProgressBar(const LLProgressBar::Params& p) 
 :	LLView(p),
 	mImageBar(p.image_bar),
-	mImageShadow(p.image_shadow),
 	mImageFill(p.image_fill),
 	mColorBackground(p.color_bg()),
 	mColorBar(p.color_bar()),
-	mColorBar2(p.color_bar2()),
-	mColorShadow(p.color_shadow()),
 	mPercentDone(0.f)
 {}
 
@@ -85,10 +79,10 @@ void LLProgressBar::draw()
 
 	F32 alpha = 0.5f + 0.5f*0.5f*(1.f + (F32)sin(3.f*timer.getElapsedTimeF32()));
 	LLColor4 bar_color = mColorBar.get();
-	bar_color.mV[3] = alpha;
+	bar_color.mV[VALPHA] *= alpha; // modulate alpha
 	LLRect progress_rect = getLocalRect();
 	progress_rect.mRight = llround(getRect().getWidth() * (mPercentDone / 100.f));
-	mImageFill->draw(progress_rect);
+	mImageFill->draw(progress_rect, bar_color);
 }
 
 void LLProgressBar::setPercent(const F32 percent)