diff options
| author | simon <none@none> | 2014-08-21 09:11:11 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-08-21 09:11:11 -0700 |
| commit | 95a14433b8b6375b8d62970c6df5a08d98764423 (patch) | |
| tree | 8578902253fc5454827e24eedc39717be9d987e2 /indra/llui/lltooltip.cpp | |
| parent | a14ba78dbbfc925c94f1e8ed94b52bc08e626e3d (diff) | |
| parent | 518cc86156c2e10b9e603ac9e661f8c35faf5f70 (diff) | |
Merge downstream code into viewer-lion and become version 3.7.15
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); |