diff options
| author | Richard Linden <none@none> | 2013-07-15 11:06:22 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-07-15 11:06:22 -0700 |
| commit | c03e366a6022d13fcf7b7e502daff8c72f7b64ee (patch) | |
| tree | 6f92e21824332b5357f8befe4c978b83dbaa1aef /indra/llui/lltooltip.cpp | |
| parent | 27de692bd7b297c9cd0fd6abcdee4b3e2486ec52 (diff) | |
| parent | 11e14cd3b0f58225a96b9b7a9839a7f030fe4045 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llui/lltooltip.cpp')
| -rwxr-xr-x | indra/llui/lltooltip.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp index f52a3b3323..782d26fccb 100755 --- a/indra/llui/lltooltip.cpp +++ b/indra/llui/lltooltip.cpp @@ -476,6 +476,9 @@ 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>()); |