diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2010-11-12 12:24:15 -0800 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2010-11-12 12:24:15 -0800 |
| commit | 187b21e6d22204e8989b1c7d5e75f8b7880dd79f (patch) | |
| tree | 8f60e069433afa48fc9a20ecc165863a0108c1aa /indra/newview/llchathistory.cpp | |
| parent | e3677f9ee2223cc13d12456e1eee4f7f9a90c474 (diff) | |
| parent | 5b86f60a13f28f5978ff3a53371cb3bae7f0d837 (diff) | |
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 3dc6e786d3..0f7e9313a9 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -335,7 +335,7 @@ public: LLAvatarIconCtrl* icon = getChild<LLAvatarIconCtrl>("avatar_icon"); - if(mSourceType != CHAT_SOURCE_AGENT) + if(mSourceType != CHAT_SOURCE_AGENT || mAvatarID.isNull()) icon->setDrawTooltip(false); switch (mSourceType) |