From 068da0b5655fc3c735cd8019ab3b6bb0defec4c0 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 6 May 2008 18:09:03 +0000
Subject: merge release-QAR-511 Viewer 1.20 RC 5 merge Branch_1-20-Viewer -r
85828 : 86279 -> release
---
indra/llui/llfloater.cpp | 2 ++
indra/llui/lltabcontainer.cpp | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
(limited to 'indra/llui')
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index f80028656e..b595845546 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2571,6 +2571,8 @@ void LLMultiFloater::addFloater(LLFloater* floaterp, BOOL select_added_floater,
floaterp->setCanResize(FALSE);
floaterp->setCanDrag(FALSE);
floaterp->storeRectControl();
+ // avoid double rendering of floater background (makes it more opaque)
+ floaterp->setBackgroundVisible(FALSE);
if (mAutoResize)
{
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index a1844d34f9..2d1228b084 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -716,7 +716,6 @@ void LLTabContainer::addTabPanel(LLPanel* child,
child->setFollowsAll();
child->translate( tab_panel_rect.mLeft - child->getRect().mLeft, tab_panel_rect.mBottom - child->getRect().mBottom);
child->reshape( tab_panel_rect.getWidth(), tab_panel_rect.getHeight(), TRUE );
- child->setBackgroundVisible( FALSE ); // No need to overdraw
// add this child later
child->setVisible( FALSE ); // Will be made visible when selected
@@ -1795,3 +1794,4 @@ void LLTabContainer::commitHoveredButton(S32 x, S32 y)
}
}
+
--
cgit v1.2.3