diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-08-12 20:35:17 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-08-12 20:35:17 -0700 |
| commit | 30972fca1d1048a1dbfcb28d58489cd687820ec0 (patch) | |
| tree | 6291a9f0435024c8f60729c1d11d4b4698e98f96 /indra/llui | |
| parent | 231572cfed6d178658bc3333eb97aff34746cb81 (diff) | |
| parent | 1346949e4d601e8c945fa30593ba1d405e9ed80d (diff) | |
Pull merge from lindenlab/viewer-release
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); |