diff options
| author | James Cook <james@lindenlab.com> | 2009-10-03 23:40:28 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-10-03 23:40:28 +0000 |
| commit | ada0f4fa221f2c7070fb02a2b7ff903bdde11c45 (patch) | |
| tree | 0ede83511c304110138c01d16da2fff55162ef31 /indra/newview/lltoolbar.cpp | |
| parent | b1a280841e1823a19658923a8eefeb67d1d70735 (diff) | |
Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml
Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
Diffstat (limited to 'indra/newview/lltoolbar.cpp')
| -rw-r--r-- | indra/newview/lltoolbar.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp index c7c9f07504..0572f9a698 100644 --- a/indra/newview/lltoolbar.cpp +++ b/indra/newview/lltoolbar.cpp @@ -271,6 +271,7 @@ void LLToolBar::updateCommunicateList() contact_sd["columns"][0]["value"] = LLFloaterMyFriends::getInstance()->getShortTitle(); if (LLFloaterMyFriends::getInstance() == frontmost_floater) { + contact_sd["columns"][0]["font"]["name"] = "SANSSERIF_SMALL"; contact_sd["columns"][0]["font"]["style"] = "BOLD"; // make sure current tab is selected in list if (selected.isUndefined()) @@ -286,6 +287,7 @@ void LLToolBar::updateCommunicateList() if (LLFloaterChat::getInstance() == frontmost_floater) { + communicate_sd["columns"][0]["font"]["name"] = "SANSSERIF_SMALL"; communicate_sd["columns"][0]["font"]["style"] = "BOLD"; if (selected.isUndefined()) { @@ -318,6 +320,7 @@ void LLToolBar::updateCommunicateList() im_sd["columns"][0]["value"] = floater_title; if (im_floaterp == frontmost_floater) { + im_sd["columns"][0]["font"]["name"] = "SANSSERIF_SMALL"; im_sd["columns"][0]["font"]["style"] = "BOLD"; if (selected.isUndefined()) { |