diff options
| author | Graham Linden <graham@lindenlab.com> | 2014-08-05 08:33:21 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2014-08-05 08:33:21 -0700 |
| commit | ea50327a27299efca6a1451b1b2e37aab2113297 (patch) | |
| tree | 8e62bc52d132366a7b81cdfd7590d14db9d17bed /indra/llui | |
| parent | db43a0560c259623a1a8022668f8482d82cae9c8 (diff) | |
| parent | 1346949e4d601e8c945fa30593ba1d405e9ed80d (diff) | |
Merge to 3.7.14
Diffstat (limited to 'indra/llui')
| -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); |