diff options
| author | Richard Linden <none@none> | 2014-06-17 10:34:24 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-06-17 10:34:24 -0700 |
| commit | ff325bd7ae90d3205b35c7a8e894714c0fad45ba (patch) | |
| tree | 44c946a857a5a8e01bf19b30e94e5bfa8d93f443 /indra/llui | |
| parent | ee14005a2aea89b2988fa0a5060f38b669e45389 (diff) | |
| parent | 2834c7968de9efc81d3c7db8a9c2b5cd2f16d6a3 (diff) | |
Merge
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); |