diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:26:19 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:26:19 -0500 |
| commit | cc65a9dbe2a8570b3f392aacfb3a6ee1d76ee2be (patch) | |
| tree | 9736a496da97c9a190da076f7311280d9864d638 /indra/llui/llaccordionctrltab.cpp | |
| parent | c51608633ddfdcf9a053fff37461059398ed4500 (diff) | |
| parent | e1d31a5aca0e1619769735e6902b012bad965805 (diff) | |
merge up to latest beta
Diffstat (limited to 'indra/llui/llaccordionctrltab.cpp')
| -rw-r--r-- | indra/llui/llaccordionctrltab.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp index 9d49c1a831..9e4849c58b 100644 --- a/indra/llui/llaccordionctrltab.cpp +++ b/indra/llui/llaccordionctrltab.cpp @@ -203,7 +203,8 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::draw() S32 width = getRect().getWidth(); S32 height = getRect().getHeight(); - gl_rect_2d(0,0,width - 1 ,height - 1,mHeaderBGColor.get(),true); + F32 alpha = getCurrentTransparency(); + gl_rect_2d(0,0,width - 1 ,height - 1,mHeaderBGColor.get() % alpha,true); LLAccordionCtrlTab* parent = dynamic_cast<LLAccordionCtrlTab*>(getParent()); bool collapsible = (parent && parent->getCollapsible()); |