diff options
| author | Richard Linden <none@none> | 2010-08-23 22:37:30 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-23 22:37:30 -0700 |
| commit | 4115decfa14bb3d20f464ed0e0e3b3ec6c7b6e02 (patch) | |
| tree | 80d13d1caa99af055f9fcdc2f90ddfc29c644738 /indra/newview | |
| parent | d1294e5aeb78205cbc580b8159f0a15b2102bd26 (diff) | |
| parent | 44e312541acd151c9d3ae264fae44e2d10284969 (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfavoritesbar.cpp | 19 | ||||
| -rw-r--r-- | indra/newview/llhints.cpp | 2 |
2 files changed, 6 insertions, 15 deletions
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp index b8776d0af2..18a6ac031f 100644 --- a/indra/newview/llfavoritesbar.cpp +++ b/indra/newview/llfavoritesbar.cpp @@ -167,22 +167,13 @@ public: if (!region_name.empty()) { - LLToolTip::Params params; std::string extra_message = llformat("%s (%d, %d, %d)", region_name.c_str(), mLandmarkInfoGetter.getPosX(), mLandmarkInfoGetter.getPosY(), mLandmarkInfoGetter.getPosZ()); + LLToolTip::Params params; params.message = llformat("%s\n%s", getLabelSelected().c_str(), extra_message.c_str()); - - LLRect rect = calcScreenRect(); - LLFontGL* standart_font = LLFontGL::getFontSansSerif(); - if(standart_font) - { - S32 w = llmax((S32)(standart_font->getWidthF32(getLabelSelected())+0.5),(S32)(standart_font->getWidthF32(extra_message)+0.5)); - rect.mRight = rect.mLeft + w; - params.max_width = w; - } - - params.sticky_rect = rect; + params.max_width = 1000; + params.sticky_rect = calcScreenRect(); LLToolTipMgr::instance().show(params); } @@ -676,9 +667,9 @@ const LLButton::Params& LLFavoritesBarCtrl::getButtonParams() { LLXMLNodePtr button_xml_node; if(LLUICtrlFactory::getLayeredXMLNode("favorites_bar_button.xml", button_xml_node)) - { + { LLXUIParser::instance().readXUI(button_xml_node, button_params, "favorites_bar_button.xml"); - } + } params_initialized = true; } diff --git a/indra/newview/llhints.cpp b/indra/newview/llhints.cpp index e0ced5caeb..11b7ffe1af 100644 --- a/indra/newview/llhints.cpp +++ b/indra/newview/llhints.cpp @@ -297,7 +297,7 @@ void LLHints::show(LLNotificationPtr hint) { LLHintPopup::Params p(LLUICtrlFactory::getDefaultParams<LLHintPopup>()); - LLParamSDParser::instance().readSD(hint->getPayload(), p); + LLParamSDParser::instance().readSD(hint->getPayload(), p, true); p.notification = hint; if (p.validateBlock()) |