From 6ae0a9e2c1ac51385c341ff4a93384950e2e7e40 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Mon, 28 Jan 2008 23:36:41 +0000 Subject: svn merge -r 78408:78432 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Viewer Port these changes which have passed QA in QAR-186: * Bumping version numbers to 1.19.0 * DEV-8872 Text in group list in profile and group notices is difficult to read * DEV-9290 Clicking on Chat button in toolbar does not toggle chat bar * DEV-4721 Upload symbol map files to S3 --- indra/llui/llpanel.cpp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'indra/llui/llpanel.cpp') diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp index 294ce5df18..07ebfb7979 100644 --- a/indra/llui/llpanel.cpp +++ b/indra/llui/llpanel.cpp @@ -340,11 +340,6 @@ void LLPanel::addCtrl( LLUICtrl* ctrl, S32 tab_group) mLastTabGroup = tab_group; LLView::addCtrl(ctrl, tab_group); - // propagate chrome to children only if they have not been flagged as chrome - if (!ctrl->getIsChrome()) - { - ctrl->setIsChrome(getIsChrome()); - } } void LLPanel::addCtrlAtEnd( LLUICtrl* ctrl, S32 tab_group) @@ -352,10 +347,6 @@ void LLPanel::addCtrlAtEnd( LLUICtrl* ctrl, S32 tab_group) mLastTabGroup = tab_group; LLView::addCtrlAtEnd(ctrl, tab_group); - if (!ctrl->getIsChrome()) - { - ctrl->setIsChrome(getIsChrome()); - } } BOOL LLPanel::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent ) -- cgit v1.3