Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

Browse Source
This commit is contained in:
Shyotl
2016-04-11 02:51:08 -05:00
parent d40256fb31
commit be5d2f20bc
1280 changed files with 2354 additions and 10692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
indra/llui/llprogressbar.cpp
View File

@@ -48,16 +48,16 @@
static LLRegisterWidget<LLProgressBar> r("progress_bar");
LLProgressBar::LLProgressBar(const std::string& name, const LLRect &rect)
: LLView(name, rect, FALSE),
mImageBar( NULL ),
mImageShadow( NULL )
: LLView(name, rect, FALSE)
//mImageBar( NULL ),
// mImageShadow( NULL )
{
mPercentDone = 0.f;
// Defaults:
setImageBar("rounded_square.tga");
setImageShadow("rounded_square_soft.tga");
setImageBar("Rounded_Square");
setImageShadow("Rounded_Square_Soft");
mColorBackground = LLColor4(0.3254f, 0.4000f, 0.5058f, 1.0f);
mColorBar = LLColor4(0.5764f, 0.6627f, 0.8352f, 1.0f);
@@ -75,10 +75,8 @@ void LLProgressBar::draw()
static LLTimer timer;
F32 alpha = getDrawContext().mAlpha;
//LLUIImagePtr shadow_imagep = LLUI::getUIImage("rounded_square_soft.tga");
LLUIImagePtr bar_fg_imagep = LLUI::getUIImage("progressbar_fill.tga");
LLUIImagePtr bar_bg_imagep = LLUI::getUIImage("progressbar_track.tga");
//LLUIImagePtr bar_imagep = LLUI::getUIImage("rounded_square.tga");
LLUIImagePtr bar_fg_imagep = LLUI::getUIImage("ProgressBar");
LLUIImagePtr bar_bg_imagep = LLUI::getUIImage("ProgressTrack");
LLColor4 background_color = LLUI::sColorsGroup->getColor("LoginProgressBarBgColor");
bar_bg_imagep->draw(getLocalRect(), background_color % alpha);
@@ -95,12 +93,12 @@ void LLProgressBar::setPercent(const F32 percent)
void LLProgressBar::setImageBar( const std::string &bar_name )
{
mImageBar = LLUI::getUIImage(bar_name)->getImage();
//mImageBar = LLUI::getUIImage(bar_name)->getImage();
}
void LLProgressBar::setImageShadow(const std::string &shadow_name)
{
mImageShadow = LLUI::getUIImage(shadow_name)->getImage();
//mImageShadow = LLUI::getUIImage(shadow_name)->getImage();
}
void LLProgressBar::setColorBar(const LLColor4 &c)
@@ -140,14 +138,14 @@ LLView* LLProgressBar::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactor
LLProgressBar *progress = new LLProgressBar(name, LLRect());
std::string image_bar;
/*std::string image_bar;
if (node->hasAttribute("image_bar")) node->getAttributeString("image_bar",image_bar);
if (image_bar != LLStringUtil::null) progress->setImageBar(image_bar);
std::string image_shadow;
if (node->hasAttribute("image_shadow")) node->getAttributeString("image_shadow",image_shadow);
if (image_shadow != LLStringUtil::null) progress->setImageShadow(image_shadow);
if (image_shadow != LLStringUtil::null) progress->setImageShadow(image_shadow);*/
LLColor4 color_bar;