livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
Josh Bell 2008-01-28 23:36:41 +00:00
parent 5a85e84dea
commit 6ae0a9e2c1
6 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llcommon/llversionviewer.h
View File

@ -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";

9
indra/llui/llpanel.cpp
View File

@ -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 )

5
indra/llui/llscrolllistctrl.cpp
View File

@ -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)
{

21
indra/llui/lluictrl.cpp
View File

@ -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,

4
indra/newview/English.lproj/InfoPlist.strings
View File

@ -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.";

2
indra/newview/Info-SecondLife.plist
View File

@ -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>