diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
| commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
| tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/llui/llprogressbar.h | |
| parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
Merge recent changes
Diffstat (limited to 'indra/llui/llprogressbar.h')
| -rw-r--r-- | indra/llui/llprogressbar.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/llui/llprogressbar.h b/indra/llui/llprogressbar.h index 5c2f73ef9e..b6a5b0400d 100644 --- a/indra/llui/llprogressbar.h +++ b/indra/llui/llprogressbar.h @@ -43,12 +43,9 @@ public: struct Params : public LLInitParam::Block<Params, LLView::Params> { Optional<LLUIImage*> image_bar, - image_fill, - image_shadow; + image_fill; Optional<LLUIColor> color_bar, - color_bar2, - color_shadow, color_bg; Params(); @@ -65,10 +62,7 @@ private: LLPointer<LLUIImage> mImageBar; LLUIColor mColorBar; - LLUIColor mColorBar2; - LLPointer<LLUIImage> mImageShadow; - LLUIColor mColorShadow; LLUIColor mColorBackground; LLPointer<LLUIImage> mImageFill; |