diff options
| author | Richard Linden <none@none> | 2014-04-07 19:09:40 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-04-07 19:09:40 -0700 |
| commit | 98aabdc176c23de9ba23f902dc2015f9c775d26e (patch) | |
| tree | 5ac6ffdb8e9be8d3c2a2f8b591c9971726c6b73c /indra/llui/lltooltip.cpp | |
| parent | 7e966f28da79d2d24f93a2615c8807421300700c (diff) | |
| parent | e5bbdafdeda0f2e6bbe97d59a24ca398b54c31eb (diff) | |
merge with release
Diffstat (limited to 'indra/llui/lltooltip.cpp')
| -rwxr-xr-x | indra/llui/lltooltip.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp index f52a3b3323..5e1f12996e 100755 --- a/indra/llui/lltooltip.cpp +++ b/indra/llui/lltooltip.cpp @@ -476,12 +476,15 @@ void LLToolTipMgr::show(const std::string& msg) void LLToolTipMgr::show(const LLToolTip::Params& params) { + if (!params.styled_message.isProvided() + && (!params.message.isProvided() || params.message().empty())) return; + // fill in default tooltip params from tool_tip.xml LLToolTip::Params params_with_defaults(params); params_with_defaults.fillFrom(LLUICtrlFactory::instance().getDefaultParams<LLToolTip>()); if (!params_with_defaults.validateBlock()) { - llwarns << "Could not display tooltip!" << llendl; + LL_WARNS() << "Could not display tooltip!" << LL_ENDL; return; } |