diff options
| author | Cho <cho@lindenlab.com> | 2014-08-20 01:11:55 +0100 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2014-08-20 01:11:55 +0100 |
| commit | d071aeb6f1ff0d98e27e93391f004d6ff947e3b1 (patch) | |
| tree | faa6d458733c4f6288974ab370d7f480ed73a17c /indra/llui/lltooltip.cpp | |
| parent | 89eac2548a9b66d8bab27a7e8d7d1ed2159e9515 (diff) | |
| parent | d576e66210c020a8a86bcc88898a352bc0875d9a (diff) | |
merge
Diffstat (limited to 'indra/llui/lltooltip.cpp')
| -rwxr-xr-x | indra/llui/lltooltip.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp index 5e1f12996e..7f2224870d 100755 --- a/indra/llui/lltooltip.cpp +++ b/indra/llui/lltooltip.cpp @@ -477,7 +477,8 @@ 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; + && (!params.message.isProvided() || params.message().empty()) + && !params.image.isProvided()) return; // fill in default tooltip params from tool_tip.xml LLToolTip::Params params_with_defaults(params); |