diff options
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 6 | ||||
| -rw-r--r-- | indra/llui/llpanel.cpp | 9 | ||||
| -rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 5 | ||||
| -rw-r--r-- | indra/llui/lluictrl.cpp | 21 | ||||
| -rw-r--r-- | indra/newview/English.lproj/InfoPlist.strings | 4 | ||||
| -rw-r--r-- | indra/newview/Info-SecondLife.plist | 2 |
6 files changed, 29 insertions, 18 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index c82a9b788b..04309b04fa 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -33,9 +33,9 @@ #define LL_LLVERSIONVIEWER_H const S32 LL_VERSION_MAJOR = 1; -const S32 LL_VERSION_MINOR = 18; -const S32 LL_VERSION_PATCH = 6; -const S32 LL_VERSION_BUILD = 4; +const S32 LL_VERSION_MINOR = 19; +const S32 LL_VERSION_PATCH = 0; +const S32 LL_VERSION_BUILD = 78408; const char * const LL_CHANNEL = "Second Life Release"; 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 ) diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 346b120c39..d6be3d045f 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -1364,7 +1364,7 @@ LLScrollListItem* LLScrollListCtrl::addCommentText(const LLString& comment_text, { // simple items have their LLSD data set to their label // always draw comment text with "enabled" color - item = new LLScrollListItemComment( comment_text, mFgSelectedColor ); + item = new LLScrollListItemComment( comment_text, mFgUnselectedColor ); addItem( item, pos, FALSE ); } return item; @@ -1664,11 +1664,12 @@ void LLScrollListCtrl::drawItems() if( mScrollLines <= line && line < mScrollLines + num_page_lines ) { - fg_color = (item->getEnabled() ? mFgSelectedColor : mFgDisabledColor); + fg_color = (item->getEnabled() ? mFgUnselectedColor : mFgDisabledColor); if( item->getSelected() && mCanSelect) { // Draw background of selected item bg_color = mBgSelectedColor; + fg_color = mFgSelectedColor; } else if (mHighlightedItem == line && mCanSelect) { diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp index 8645f50764..241adb667e 100644 --- a/indra/llui/lluictrl.cpp +++ b/indra/llui/lluictrl.cpp @@ -285,7 +285,26 @@ void LLUICtrl::setIsChrome(BOOL is_chrome) // virtual BOOL LLUICtrl::getIsChrome() const { - return mIsChrome; + // am I or any of my ancestors flagged as "chrome"? + if (mIsChrome) return TRUE; + + LLView* parent_ctrl = getParent(); + while(parent_ctrl) + { + if(parent_ctrl->isCtrl()) + { + break; + } + parent_ctrl = parent_ctrl->getParent(); + } + + if(parent_ctrl) + { + // recurse into parent_ctrl and ask if it is in a chrome subtree + return ((LLUICtrl*)parent_ctrl)->getIsChrome(); + } + + return FALSE; } // this comparator uses the crazy disambiguating logic of LLCompareByTabOrder, diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings index 81d40ac484..e71617850a 100644 --- a/indra/newview/English.lproj/InfoPlist.strings +++ b/indra/newview/English.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Second Life"; -CFBundleShortVersionString = "Second Life version 1.18.6.4"; -CFBundleGetInfoString = "Second Life version 1.18.6.4, Copyright 2004-2007 Linden Research, Inc."; +CFBundleShortVersionString = "Second Life version 1.19.0.78408"; +CFBundleGetInfoString = "Second Life version 1.19.0.78408, Copyright 2004-2007 Linden Research, Inc."; diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist index 44e9a47438..e007e6f62a 100644 --- a/indra/newview/Info-SecondLife.plist +++ b/indra/newview/Info-SecondLife.plist @@ -32,7 +32,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>1.18.6.4</string> + <string>1.19.0.78408</string> <key>CSResourcesFileMapped</key> <true/> </dict> |