diff options
| author | Graham Linden <graham@lindenlab.com> | 2014-05-29 04:54:58 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2014-05-29 04:54:58 -0700 |
| commit | a815ad481add3dea3f67f1c1c579ddb99d9a9f48 (patch) | |
| tree | e3cf5b5b77246e8cf4917e613cbffe7e414be63c /indra/llui/lltooltip.cpp | |
| parent | b703a612d7ca96e9c79f40a33208757bba6e9d7e (diff) | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
Mergeup to 3.7.9 viewer-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; } |