diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-10 22:39:11 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-10 22:39:11 -0800 |
| commit | 0e07758b540374aa421d2938ce5ed13e2b9eefe4 (patch) | |
| tree | 145600f9494489b686e13b53edc7f10d75afa0e3 /indra/newview/llchathistory.cpp | |
| parent | 4bbe823302427a705ea541d968f6058571a13c2f (diff) | |
| parent | 61fbc02deb08c1a69b8c24498fe559359496ac91 (diff) | |
merge with STORM-105 and 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) |